rallytime 73d73e80c1 Merge branch '2016.3' into 'develop' ... Conflicts: - doc/topics/releases/2015.8.4.rst - doc/topics/releases/2015.8.5.rst - doc/topics/thorium/index.rst - salt/cloud/clouds/opennebula.py - salt/engines/thorium.py - salt/loader.py - salt/modules/archive.py - salt/modules/boto_vpc.py - salt/modules/data.py - salt/modules/reg.py - salt/pillar/mysql.py - salt/runners/cache.py - salt/states/archive.py - salt/states/cron.py - salt/states/file.py - salt/states/glance.py - salt/states/reg.py - salt/thorium/__init__.py - salt/thorium/check.py - salt/thorium/file.py - salt/thorium/reg.py - salt/utils/jid.py - salt/utils/parsers.py - setup.py		2016-02-12 14:38:50 -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	Lint and test fixes	2016-02-11 11:22:35 -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