rallytime 9898fcf613 Merge branch '2015.2' into 'develop' ... Conflicts: .gitignore .pylintrc .testing.pylintrc salt/client/mixins.py salt/cloud/clouds/msazure.py salt/config.py salt/modules/mount.py salt/runners/doc.py salt/utils/event.py salt/utils/reactor.py		2015-01-29 17:24:04 -07:00
..
beacons	Fixed typos in the beacon docs	2015-01-26 18:20:54 -07:00
cloud	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-01-21 12:05:51 -07:00
development	Merge branch '2015.2' into 'develop'	2015-01-16 11:36:32 -07:00
eauth	Whitespace cleanup	2014-12-11 07:53:19 -08:00
event	Adds fire_master to the Salt Event library, for use in 3rd-party code.	2015-01-13 09:29:27 +13:00
ext_processes	Whitespace cleanup	2014-12-11 07:53:19 -08:00
installation	Merge branch '2015.2' into 'develop'	2015-01-29 17:24:04 -07:00
jobs	Comma cleanup	2014-12-12 11:40:36 -08:00
master_tops	Whitespace cleanup	2014-12-11 07:53:19 -08:00
mine	Add docs for mine in salt-ssh	2014-12-23 12:14:31 -07:00
netapi	Whitespace cleanup	2014-12-11 07:53:19 -08:00
pillar	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
reactor	Whitespace cleanup	2014-12-11 07:53:19 -08:00
releases	Merge branch '2015.2' into 'develop'	2015-01-29 17:24:04 -07:00
sdb	Whitespace cleanup	2014-12-11 07:53:19 -08:00
ssh	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-01-13 12:09:56 -07:00
targeting	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-23 16:13:30 -07:00
topology	Comma cleanup	2014-12-12 11:38:50 -08:00
transports/raet	Comma cleanup	2014-12-12 11:38:18 -08:00
troubleshooting	Some fixes to #19161	2015-01-07 20:58:40 +00:00
tutorials	Merge branch '2015.2' into 'develop'	2015-01-29 17:24:04 -07:00
virt	Whitespace cleanup	2014-12-11 07:53:19 -08:00
windows	added support for multiple source files in windows repo to fix saltstack/salt#9028	2015-01-22 11:55:33 -08:00
yaml	Whitespace cleanup	2014-12-11 07:53:19 -08:00
best_practices.rst	Merge branch '2014.7' into develop	2014-12-23 10:57:26 -07:00
index.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00