Clint Shryock 30572212f2 Merge branch 'master' into pr-2779 ... * master: (86 commits) providers/google: Fix reading account_file path providers/google: Fix error appending providers/google: Return if we could parse JSON providers/google: Change account_file to JSON providers/google: Default account_file* to empty providers/google: Add account_file/account_file_contents ConflictsWith providers/google: Document account_file_contents providers/google: Use account_file_contents if provided providers/google: Add account_file_contents to provider Update CHANGELOG.md Update CHANGELOG.md use d.Id() Update CHANGELOG.md Update CHANGELOG.md scripts: change website_push to push from HEAD update analytics core: fix crash on provider warning provider/aws: Update source to comply with upstream breaking change Update CHANGELOG. provider/aws: Fix issue with IAM Server Certificates and Chains ...		2015-07-29 15:54:56 -05:00
..
r	Merge branch 'master' into pr-2779	2015-07-29 15:54:56 -05:00
index.html.markdown	aws: make MaxRetries for API calls configurable	2015-05-03 15:35:51 +02:00