vishalnayak 0d3973b1fa Merge branch 'master-oss' into bind-account-id-aws-ec2
Conflicts:
	builtin/credential/aws-ec2/backend_test.go
	builtin/credential/aws-ec2/path_login.go
	builtin/credential/aws-ec2/path_role.go
2016-06-14 14:46:08 -04:00
..
2016-03-31 14:19:03 +02:00
2016-06-14 05:59:50 +00:00
2016-06-03 11:07:54 -07:00
2016-06-14 10:22:30 -04:00
2015-03-13 10:38:41 -07:00