Clint Shryock 97b98b1da6 Merge branch 'master' into f-aws-instance-vpc-sec-ids ... * master: (511 commits) Update CHANGELOG.md core: avoid diff mismatch on NewRemoved fields during -/+ Update CHANGELOG.md update CHANGELOG Fix minor error in index/count docs terraform: remove debug terraform: when pruning destroy, only match exact nodes, or exact counts up version for dev update CHANGELOG terraform: prune tainted destroys if no tainted in state [GH-1475] update CHANGELOG config/lang: support math on variables through implicits update CHANGELOG update cHANGELOG update cHANGELOG providers/aws: set id outside if/esle providers/aws: set ID after creation core: remove dead code from pre-deposed refactor website: update LC docs to note name is optional security_groups field expects a list of Security Group Group Names, not IDs ...		2015-04-15 12:12:17 -05:00
..
r	Merge branch 'master' into f-aws-instance-vpc-sec-ids	2015-04-15 12:12:17 -05:00
index.html.markdown	website; clarify where the args go for AWS [GH-853]	2015-03-03 17:35:54 -08:00