valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,342 Commits 24 Branches 182 Tags 341 MiB
8a836c88f4
Commit Graph

5 Commits

Author SHA1 Message Date
Colton Myers
06e1a4f519 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop2 
Conflicts:
	salt/client/mixins.py
	salt/loader.py
	salt/modules/localemod.py
	salt/modules/pillar.py
	salt/netapi/rest_cherrypy/app.py
	salt/pillar/__init__.py
	salt/states/mount.py
	salt/states/ssh_auth.py
 2015-02-06 12:09:01 -07:00
Justin Findlay
8eab04bd69 fix linux_sysctl_test failures caused by #20314 2015-02-03 11:30:27 -07:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Justin Findlay
26094b39b4 pylint fix on linux_sysctl_test.py 2014-10-31 12:41:04 -06:00
Justin Findlay
106f645c9e adding tests for modules/linux_sysctl.py 2014-10-31 10:16:41 -06:00