rallytime 3b74d123af Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/modules/selinux.py - salt/modules/zypper.py - salt/pillar/__init__.py - salt/states/dockerng.py - tests/runtests.py		2016-02-25 12:36:22 -07:00
..
raet	doc: fix RAET links	2015-09-25 12:16:47 -06:00
index.rst	Assorted doc issues	2016-02-24 16:56:52 -07:00
tcp.rst	Simplify TCP/IPC wire protocol	2015-12-02 09:01:58 -08:00
zeromq.rst	Fix typo an recieved -> received	2015-11-04 10:59:22 +01:00