7 Commits

Author SHA1 Message Date
vishalnayak
ddae851f0d Replace an 'if' block with 'switch' 2016-06-17 12:35:44 -04:00
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
vishalnayak
baac0975ea Added bound_account_id to aws-ec2 auth backend 2016-06-14 11:58:19 -04:00
root
e77652d15d adding IAM Role as constrain 2016-06-14 14:49:36 +00:00
vishalnayak
2265d1a890 Use entry.Type as a criteria for upgrade 2016-06-01 10:30:11 -04:00
vishalnayak
b3ca9cf14b Rename aws as aws-ec2 2016-05-30 14:11:15 -04:00
vishalnayak
e4d98dfc9b rename credential/aws as credential/aws-ec2 2016-05-30 14:11:15 -04:00