13 Commits

Author	SHA1	Message	Date
Colton Myers	c8eb2d4665	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: doc/topics/installation/windows.rst salt/cloud/clouds/joyent.py salt/daemons/flo/core.py salt/minion.py	2015-02-23 14:25:51 -07:00
rallytime	c0cad91549	Fix unit test	2015-02-21 19:29:57 -07:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Colton Myers	174290b7aa	Add python_shell=False to all the linux_acl mocks	2015-01-08 14:29:41 -07:00
rallytime	4aa60ce51a	Fix linux_acl tests	2015-01-07 20:55:19 -07:00
Thomas S Hatch	ff593e30b2	remove duplicate code	2014-11-04 10:05:24 -07:00
Roman Inflianskas	202d3c343a	modules.linux_acl: add recursive option for all functions	2014-11-04 19:54:41 +03:00
Thomas S Hatch	8e8b4c6b5c	lint	2014-11-04 09:48:58 -07:00
Roman Inflianskas	fb5e86aaa1	modules.linux_acl: satisfy pylint	2014-11-04 16:17:35 +03:00
Roman Inflianskas	403a8b4cc9	modules.linux_acl: cleanup comments	2014-11-04 14:45:23 +03:00
Roman Inflianskas	b6cbb70e38	modules.linux_acl: add unit tests	2014-11-04 14:45:17 +03:00
Roman Inflianskas	8f409a4180	modules.linux_acl: add unit tests	2014-11-04 14:45:06 +03:00
Roman Inflianskas	16b4e2619f	modules.linux_acl: raise exception on no files given; add unit tests	2014-11-04 14:44:44 +03:00