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
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers.d	doc, conf, pkg: VMWare -> VMware	2016-02-03 14:27:28 -07:00
cloud	Fix typo formating -> formatting	2016-02-04 12:45:19 +01:00
cloud.profiles	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
master	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
minion	Merge branch '2016.3' into 'develop'	2016-02-12 14:38:50 -07:00
proxy	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00