Commit Graph

43362 Commits

Author SHA1 Message Date
Joseph Hall
25d8cb6560 Copy fixes for Windows Salt Cloud doc 2014-12-09 11:57:35 -07:00
Thomas S Hatch
274aca9b5b Merge pull request #18844 from rallytime/fix_parted_tests
Patch unittests when calling _validate_device
2014-12-09 11:46:58 -07:00
Colton Myers
08d4cbdbe3 Add **kwargs to service.mod_watch
Gets rid of warnings about `enable` and `__reqs__` not being supported
by the function
2014-12-09 11:13:16 -07:00
Thomas S Hatch
3d73816507 Merge branch '2014.7' into develop
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/network.py
	salt/utils/parsers.py
2014-12-09 10:59:18 -07:00
Thomas S Hatch
37b3e48d13 Merge pull request #18838 from rallytime/fix_archive_tests
Fix mocked calls in unit/modules/archive_test.py
2014-12-09 10:55:49 -07:00
Thomas S Hatch
6368bef4e1 Merge pull request #18845 from thatch45/bootstrap_paths
Add more paths to syspaths
2014-12-09 10:55:36 -07:00
Thomas S Hatch
2fad613c6f Add more paths to syspaths 2014-12-09 10:54:38 -07:00
Ethan Moore
44e7bf7b0c lint fixes 2014-12-09 11:48:15 -06:00
rallytime
8211dc2f00 Patch unittests when calling _validate_device 2014-12-09 10:48:02 -07:00
Elias Probst
b9f5c83b17 Pylint. 2014-12-09 18:20:02 +01:00
Elias Probst
9250786fdf Add missing import of 'salt.utils'. 2014-12-09 18:19:49 +01:00
Thomas Jackson
d9572d85af Add required funcs to the baseclass 2014-12-09 08:39:46 -08:00
Thomas Jackson
3186e246c6 Clean up the logic 2014-12-09 08:37:03 -08:00
Thomas Jackson
865c66d583 Add missing import
We use it in the ZMQChannel, I'm not sure how this works without the import
2014-12-09 07:55:56 -08:00
Nicole Thomas
48e1df7bee Merge pull request #18776 from jfindlay/quote_virtualenv
unquote venv mod commands
2014-12-09 08:50:32 -07:00
Thomas Jackson
85b4512164 Pylint fix 2014-12-09 07:41:57 -08:00
Thomas Jackson
77d8332d59 Convert wheel to channel interface as well 2014-12-09 07:41:57 -08:00
Thomas Jackson
7ed0138207 Convert saltutil to use channel instead of sreq 2014-12-09 07:41:57 -08:00
Thomas Jackson
2562b4cc31 Cleanup names, this is now a channel, not an sreq 2014-12-09 07:41:57 -08:00
rallytime
db9ae406c3 Fix mocked calls in unit/modules/archive_test.py
This is due to the changes in #18621
2014-12-09 08:36:30 -07:00
Ethan Moore
714145d50b Modified win_groupadd to use ADSI like win_useradd, added ability to manage AD users/groups via ADSI (keying off 'dc=' in username) 2014-12-09 09:34:03 -06:00
Justin Findlay
b7467f5f45 update venv unit tests accordingly 2014-12-08 23:28:28 -07:00
Justin Findlay
61e92c46ce unquote venv mod commands 2014-12-08 23:01:08 -07:00
Nicole Thomas
e0b2110fee Merge pull request #18820 from rallytime/whitespace_fixing
Whitespace fix
2014-12-08 16:36:24 -07:00
Ryan Lane
8e2a9f886c Do not sync grains in grains.setval when using local mode 2014-12-08 14:59:17 -08:00
Ryan Lane
972acf8e43 Add support for setting connection draining settings for ELBs 2014-12-08 14:47:28 -08:00
C. R. Oldham
f31afbdb58 Fix pylint, remove unecessary call to pu.db 2014-12-08 15:35:56 -07:00
Anthony Scalisi
55d1da42d3 fix typo in spec 2014-12-08 14:34:02 -08:00
Anthony Scalisi
5262424c5b fix typo in gem module doc 2014-12-08 14:33:31 -08:00
Anthony Scalisi
44963fae0e fix various typos 2014-12-08 14:32:53 -08:00
Pedro Algarvio
fdc39d0413 Remove deprecated options 2014-12-08 22:24:19 +00:00
Elias Probst
44e571fd1a Pylint. 2014-12-08 23:20:33 +01:00
Elias Probst
0e9d22b3a8 No exceptions in execution modules. 2014-12-08 23:20:00 +01:00
rallytime
141c0003da Whitespace fix 2014-12-08 15:16:44 -07:00
Thomas S Hatch
8a8d8883c6 Merge pull request #18816 from lyft/six-to-2014-7
Add salt.ext.six to 2014.7 for module backwards compat from develop
2014-12-08 15:08:39 -07:00
Thomas S Hatch
ac08c08695 Merge pull request #18815 from techhat/ec2win
Allow userdata to be passed to EC2
2014-12-08 15:07:38 -07:00
Ryan Lane
70f6ed86f6 Add salt.ext.six to 2014.7 for module backwards compat from develop 2014-12-08 13:32:53 -08:00
Joseph Hall
790cd28ff1 Update Windows docs for auto-generated Windows passwords 2014-12-08 14:23:05 -07:00
Elias Probst
2659b0ceae Documentation improvements for 'set_()'. 2014-12-08 22:17:09 +01:00
C. R. Oldham
c068c37f2d Fix logic error introduced sometime in the past 6 months that prevented all modules from being loaded. 2014-12-08 14:11:30 -07:00
Nitin Madhok
9e28d82a9a Better error handling for salt.modules.zfs.list 2014-12-08 16:02:55 -05:00
Elias Probst
203bad4af0 Don't try to run blindly non-existent modules. 2014-12-08 21:54:40 +01:00
Joseph Hall
8ec9ab937d Allow userdata to be passed to EC2 2014-12-08 13:54:25 -07:00
Elias Probst
8815232900 Documentation improvements for 'exec_action()'. 2014-12-08 21:49:22 +01:00
Nicole Thomas
76db5fdfe0 Merge pull request #18798 from s0undt3ch/2014.7
Make coverage reports optional
2014-12-08 13:40:14 -07:00
Elias Probst
968d7664cf Documentation improvements for 'set_target()'. 2014-12-08 21:39:33 +01:00
Elias Probst
72e8999b8e Handle '(unset)' as return value (when no target is set) in get_current_target(). 2014-12-08 21:32:12 +01:00
Elias Probst
fed9f2d778 Documentation improvements for 'get_current_target()'. 2014-12-08 21:29:52 +01:00
Nitin Madhok
94872177d8 Fixing bug in salt.modules.zfs.list error return 2014-12-08 15:28:57 -05:00
Thomas S Hatch
521cb2f82a Merge pull request #18804 from garethgreenaway/12178_debian_briding
fixes to debian_ip.py
2014-12-08 13:27:24 -07:00