Colton Myers
|
3f09d58fff
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/vmware.py
salt/modules/rh_ip.py
salt/modules/s3.py
salt/modules/saltutil.py
salt/modules/zypper.py
salt/spm/__init__.py
salt/utils/aws.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
tests/unit/pydsl_test.py
|
2015-12-01 15:31:03 -07:00 |
|
Tim Harper
|
e060986828
|
add support to s3 for aws role assumption
|
2015-11-28 00:57:45 -07:00 |
|
Colton Myers
|
d5fbd960fe
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/vmware.py
salt/fileserver/s3fs.py
salt/modules/chocolatey.py
salt/modules/s3.py
salt/modules/zpool.py
salt/pillar/s3.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
|
2015-08-03 15:01:35 -06:00 |
|
Joseph Hall
|
37ff73d935
|
Update tests
|
2015-07-27 18:56:55 -06:00 |
|
Stanislav Blokhin
|
595da6252e
|
Configurable AWS region & region from IAM metadata
|
2015-07-24 16:06:20 +02:00 |
|
Jayesh Kariya
|
85786bfe7f
|
adding s3 unit test case
|
2015-05-07 15:43:32 +05:30 |
|