Commit Graph

43840 Commits

Author SHA1 Message Date
Mike Place
516c3ec9bc Merge pull request #19096 from basepi/merge-forward
Merge forward from 2014.7 to develop
2014-12-19 10:29:50 -07:00
Mike Place
e77218cdd4 Merge pull request #19109 from cachedout/get_url_return
Allow the get_url fileclient to return the request contents
2014-12-19 10:16:19 -07:00
Thomas S Hatch
0febf11678 Merge pull request #19093 from thatch45/rdutch-patch-2
Merge #19089
2014-12-19 10:16:02 -07:00
Thomas S Hatch
9fea50e954 Merge pull request #19094 from thatch45/jayeshka-disk_unit_tests
Merge #18953 with lint fixes
2014-12-19 10:15:03 -07:00
Mike Place
4f29f4df16 Merge pull request #19098 from cachedout/preserve_minion_cache_flag
Preserve minion cache flag
2014-12-19 10:13:41 -07:00
Mike Place
63d5dda0a8 Merge pull request #19128 from syphernl/feature/add_in_network
Function to check whether a given IP is in a given subnet
2014-12-19 10:08:14 -07:00
Mike Place
e919e187e8 Merge pull request #19111 from jfindlay/split_choc
Split chocolatey commands
2014-12-19 10:01:08 -07:00
Mike Place
9fac2799f3 Merge pull request #19126 from syphernl/feature/add_iprev_to_network
Add IP reversal to network module
2014-12-19 09:51:07 -07:00
Nitin Madhok
aa570e3ceb Changing AssertEquals to AssertTrue and AssertFalse 2014-12-19 11:45:16 -05:00
Mike Place
f407e69943 Merge pull request #19123 from rupeshta/pw_user_unit_tests
added test cases for pw_user module
2014-12-19 09:35:25 -07:00
Mike Place
86af5a0c91 Merge pull request #19110 from rallytime/pip_state_fixes
Don't throw away package install error messages
2014-12-19 09:32:17 -07:00
Nicole Thomas
72b18519a9 Merge pull request #19119 from nmadhok/fix-lint
Changing permissions of test files and fixing lint violations
2014-12-19 09:28:27 -07:00
Nitin Madhok
0b8bed6d94 Adding another unit test to check for zfs.create success 2014-12-19 11:04:19 -05:00
Nitin Madhok
2ed539ea61 Adding another unit test to check for zfs.exists failure 2014-12-19 10:36:28 -05:00
Nitin Madhok
5c8a81a166 Adding unit tests for zfs.exists 2014-12-19 10:29:33 -05:00
Frank Klaassen
65d1477ee4 Function to check whether a given IP is in a given subnet 2014-12-19 16:02:26 +01:00
Frank Klaassen
f274d59759 Fix wrong parameter 2014-12-19 15:45:28 +01:00
Frank Klaassen
3af1b84721 Add IP reversal to network module 2014-12-19 15:40:51 +01:00
Nitin Madhok
04182825d9 Adding src folder to .gitignore to Ignore commiting unit test runs 2014-12-19 09:03:59 -05:00
Nitin Madhok
9027d1fc2f Fixing unit tests for mdadm 2014-12-19 08:55:07 -05:00
Rupesh Tare
255d107d36 added test cases for pw_user module 2014-12-19 18:51:13 +05:30
Tomas Neme
dd302e1cc1 raise KeyError if no default is provided and the key doesn't exist
(and PILLAR_RAISE_ON_MISSING setting is true-ish)
2014-12-19 20:04:39 +08:00
Nitin Madhok
15f7aaaef9 Fixing salt.modules.mdadm.create broken functionality 2014-12-19 06:45:34 -05:00
Nitin Madhok
ed57a2f8ad Redoing some changes 2014-12-19 06:36:51 -05:00
Nitin Madhok
c992f04f32 Changing permissions of test files and fixing lint violations 2014-12-19 05:50:18 -05:00
Nitin Madhok
ba308ba208 Correctly convert command list into string and do not error if conf file missing. Fixes #19117 2014-12-19 05:43:30 -05:00
Nitin Madhok
b0d76ee466 Access dictionary values correctly in salt.modules.mdadm.destroy Fixes #19115 2014-12-19 05:15:24 -05:00
Jayesh
0b1ea591ed unit test case for groupadd 2014-12-19 12:03:45 +05:30
Gareth J. Greenaway
ec9061983e Fixes for when using bind mounts. 2014-12-18 17:13:20 -08:00
Colton Myers
bf21885835 Pass mine arg down to Single objects from SSH.run_iter 2014-12-18 17:15:00 -07:00
Thomas S Hatch
4194a22f07 Merge pull request #19097 from thatch45/fix_perms
Fix perms
2014-12-18 17:02:21 -07:00
Colton Myers
9f15b02eb3 Add wfunc wrapper for mine.get for salt-ssh 2014-12-18 16:56:11 -07:00
Justin Findlay
44de89b43e chocolatey pylint fix 2014-12-18 16:14:02 -07:00
Justin Findlay
798eae73fb split chocolatey commands 2014-12-18 16:14:02 -07:00
Mike Place
bda4eae9d0 Allow the get_url fileclient to return the request contents 2014-12-18 15:09:06 -07:00
rallytime
a9c87110e7 Don't throw away package install error messages 2014-12-18 15:04:43 -07:00
Joseph Hall
dee41b9a59 Merge pull request #19108 from nlm/develop
edited_conf docstring fix
2014-12-18 14:47:29 -07:00
Justin Findlay
e72cd5ae35 lint fix for win_service module 2014-12-18 14:47:01 -07:00
Justin Findlay
effb6a3b58 lint fix for win_ntp module 2014-12-18 14:46:56 -07:00
Nicolas Limage
225e28e47b edited_conf docstring fix 2014-12-18 22:42:18 +01:00
Seth House
d5ed3f30bd Used unused variable; fix highstate output for jobs runner
Closes #19099
2014-12-18 14:40:47 -07:00
Colton Myers
b62f78d32f Merge pull request #19107 from basepi/2014.7.1.release
Add more release notes for 2014.7.1
2014-12-18 14:20:23 -07:00
Colton Myers
9d5e05a381 Add more release notes for 2014.7.1 2014-12-18 14:19:52 -07:00
Justin Findlay
7361d1e527 chcp is a cmd builtin 2014-12-18 14:12:20 -07:00
Justin Findlay
093c526323 split win_useradd commands 2014-12-18 14:12:20 -07:00
Justin Findlay
e95078fcde split win_timezone commands 2014-12-18 14:12:20 -07:00
Justin Findlay
fe2ebd4c9c split win_system commands 2014-12-18 14:12:20 -07:00
Justin Findlay
866f94f813 split win_shadow commands 2014-12-18 14:12:20 -07:00
Justin Findlay
09d1f953b2 split win_service commands 2014-12-18 14:12:20 -07:00
Justin Findlay
ce5fc58f36 split win_pkg commands 2014-12-18 14:12:20 -07:00