Colton Myers
|
076b49a4ca
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
README.rst
doc/conf.py
doc/ref/index.rst
doc/ref/proxy/all/salt.proxy.ssh_sample.rst
doc/topics/installation/rhel.rst
doc/topics/releases/2015.8.4.rst
doc/topics/tutorials/states_pt5.rst
salt/cloud/clouds/ec2.py
salt/cloud/clouds/opennebula.py
salt/config/__init__.py
salt/modules/boto_dynamodb.py
salt/modules/boto_ec2.py
salt/modules/boto_elasticache.py
salt/modules/boto_elb.py
salt/modules/boto_iam.py
salt/modules/boto_rds.py
salt/modules/boto_sns.py
salt/modules/boto_sqs.py
salt/modules/dracr.py
salt/modules/git.py
salt/modules/mine.py
salt/modules/systemd.py
salt/modules/win_pkg.py
salt/modules/yumpkg.py
salt/pillar/__init__.py
salt/states/git.py
salt/states/rabbitmq_vhost.py
salt/states/saltmod.py
salt/utils/pkg/rpm.py
setup.py
tests/unit/modules/systemd_test.py
tests/unit/states/rabbitmq_vhost_test.py
|
2016-02-11 22:33:49 -07:00 |
|
Mike Place
|
446b4c2aff
|
Lint #30975
|
2016-02-10 14:04:59 -07:00 |
|
Tim Harper
|
b4fe9aaa11
|
fixes issue in which s3.role_arn was defaulting to ''
fixes #30899
|
2016-02-06 14:10:20 -07:00 |
|
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 |
|