rallytime cded9ac01d Merge branch '2015.8' into 'develop' ... Conflicts: - salt/cloud/clouds/vmware.py - salt/modules/freebsdpkg.py - salt/modules/virtualenv_mod.py - salt/states/boto_asg.py - tests/integration/__init__.py - tests/runtests.py		2015-11-06 09:34:31 -07:00
..
salt-api.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-call.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-cloud.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-cp.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-key.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-master.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-minion.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-proxy.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-run.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-ssh.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-syndic.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt-unity.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00
salt.7	Merge branch '2015.8' into 'develop'	2015-11-06 09:34:31 -07:00
spm.1	regenerated man pages for 2015.8.1	2015-09-30 12:58:34 -06:00