Commit Graph

4 Commits

Author SHA1 Message Date
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