rallytime cbf42a8407 Merge branch '2016.3' into 'develop' ... Conflicts: - conf/master - doc/ref/configuration/master.rst - salt/cli/batch.py - salt/cli/daemons.py - salt/config/__init__.py - salt/minion.py - salt/modules/aptpkg.py - salt/modules/beacons.py - salt/states/archive.py - salt/states/cmd.py - salt/utils/gitfs.py - tests/unit/states/cmd_test.py		2016-04-26 14:42:26 -06:00
..
pkgdb	Pass a package name to unregister_file()	2015-09-01 14:21:57 -06:00
pkgfiles	Ensure double directories don't get created	2016-02-10 11:04:54 -07:00
__init__.py	Merge branch '2016.3' into 'develop'	2016-04-26 14:42:26 -06:00