rallytime 1fe0b69a6c Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/blockdev.py - salt/modules/ddns.py - salt/modules/inspectlib/collector.py - salt/modules/linux_sysctl.py - salt/modules/status.py - salt/modules/x509.py - salt/utils/process.py - salt/utils/verify.py - tests/integration/__init__.py - tests/integration/modules/state.py - tests/integration/states/cmd.py		2016-08-12 16:21:58 -06:00
..
base	Merge branch '2016.3' into 'develop'	2016-08-12 16:21:58 -06:00
prod	Revert changes in files used by roots_test.py integration test	2016-03-02 10:00:45 +02:00