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
..
__init__.py	Test cases	2014-02-06 05:14:52 +00:00
consul_test.py	Don't split multiline values into a list if wrapped inside "	2015-06-12 03:46:28 +01:00
git_test.py	Fix typo catched -> caught	2016-02-04 12:57:20 +01:00
hg_test.py	fix hg_pillar unittest lint errors	2015-03-24 15:52:13 +01:00
mysql_test.py	Revert "Deprecated code removed. "	2016-02-10 11:40:48 -07:00
sqlcipher_test.py	Add Pillar SQLCipher module	2015-12-17 09:48:27 +02:00
sqlite3_test.py	Add a SQLite3 ext_pillar built on the sql_base pillar.	2015-05-27 14:45:33 -04:00