valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
43,656 Commits 24 Branches 182 Tags 341 MiB
b721203ed1
Commit Graph

43656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
b721203ed1 Merge pull request #19141 from thatch45/skylerberg-six-version-requirement 
Merge #19101 with fixes
 2014-12-19 13:59:14 -07:00
Thomas S Hatch
6a2edbc5af remove six dep, we bundle it now 2014-12-19 13:57:55 -07:00
Mike Place
22711eec20 Merge pull request #19140 from cachedout/dev_lint 
Lint fixes for key.py and utils/network.py
 2014-12-19 13:57:46 -07:00
Thomas S Hatch
88a109c7b5 Merge branch 'six-version-requirement' of https://github.com/skylerberg/salt into skylerberg-six-version-requirement 2014-12-19 13:57:31 -07:00
Mike Place
cde37d2523 Lint fixes for key.py and utils/network.py 2014-12-19 13:56:57 -07:00
Mike Place
28252ba0b8 Merge pull request #19131 from cachedout/fix_pip_tests 
Fix failing tests in develop
 2014-12-19 11:46:14 -07:00
Mike Place
0d98980dc4 Merge pull request #19133 from cachedout/remove_sed_tests 
Remove deprecated tests
 2014-12-19 11:38:40 -07:00
Mike Place
7ff6c22b9b Remove deprecated tests 2014-12-19 11:37:56 -07:00
Mike Place
05fed01430 Fix failing tests in develop 2014-12-19 11:05:47 -07:00
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
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
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
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
Rupesh Tare
255d107d36 added test cases for pw_user module 2014-12-19 18:51:13 +05:30
Nitin Madhok
c992f04f32 Changing permissions of test files and fixing lint violations 2014-12-19 05:50:18 -05:00
Thomas S Hatch
4194a22f07 Merge pull request #19097 from thatch45/fix_perms 
Fix perms
 2014-12-18 17:02:21 -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
Nicolas Limage
225e28e47b edited_conf docstring fix 2014-12-18 22:42:18 +01:00
Skyler Berg
aaf83b2c98 Add minimum version requirement for six 
Salt uses the function add_metaclass function which had a different name
prior to six version 1.4.0.

Signed-off-by: Skyler Berg <skyler.berg@huawei.com>
 2014-12-18 11:50:51 -08:00
Mike Place
e98d225c47 Remove debugging 2014-12-18 12:03:32 -07:00
Mike Place
bf81871b2c Preserve a minion cache on a per-request basis to revoke_auth 2014-12-18 12:00:53 -07:00
Thomas S Hatch
2546c489f8 try out pylint disable for perms 2014-12-18 10:43:41 -07:00
Thomas S Hatch
6a9195e190 fix bad file perms 2014-12-18 10:42:25 -07:00
Thomas S Hatch
b8f4cc7021 more lint 2014-12-18 10:33:31 -07:00
Colton Myers
43df12b6cc Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/client/ssh/shell.py
	salt/modules/file.py
	tests/integration/states/file.py
 2014-12-18 10:32:19 -07:00
Colton Myers
75dc997ced Merge pull request #19095 from basepi/pylint-merge-forward 
Fix some mistakes from the merge forward
 2014-12-18 10:21:26 -07:00
Colton Myers
9edba95913 Revert bad merge forward of salt/utils/event.py 2014-12-18 10:18:26 -07:00
Thomas S Hatch
cc8705bcba lint 2014-12-18 10:15:58 -07:00
Thomas S Hatch
6afb8b64d6 Merge branch 'disk_unit_tests' of https://github.com/jayeshka/salt into jayeshka-disk_unit_tests 2014-12-18 10:11:01 -07:00
Thomas S Hatch
78e77a5a29 lint 2014-12-18 10:03:32 -07:00
Thomas S Hatch
ea4f42ffb4 Merge branch 'patch-2' of https://github.com/rdutch/salt into rdutch-patch-2 2014-12-18 10:01:29 -07:00
Thomas S Hatch
1a8a4d3bbf Merge pull request #19001 from mirath/feature/pip_pkgs 
Added support for a pkgs argument to the pip state
 2014-12-18 09:59:30 -07:00
Colton Myers
1ffabf902a Remove code that shouldn't have been merged forward to develop 2014-12-18 09:55:58 -07:00
Thomas S Hatch
e29b7be9f8 Merge pull request #19005 from cachedout/route_errors 
Route minion errors to master
 2014-12-18 09:51:41 -07:00
Thomas S Hatch
f69575b65d Merge pull request #19088 from terminalmage/fix-update_lxc_conf 
Fix regression in lxc.update_lxc_conf
 2014-12-18 09:48:46 -07:00
Thomas S Hatch
34def7d81e Merge pull request #19086 from rallytime/bp-19014 
Backport #19014 to 2014.7
 2014-12-18 09:48:09 -07:00
Thomas S Hatch
6dd8f40c7b Merge pull request #19073 from s0undt3ch/features/file-perms-lint-2014.7 
Enable file permissions lint checker
 2014-12-18 09:41:03 -07:00
Thomas S Hatch
fbdf49d3ac Merge pull request #19071 from mikaelhm/add-depth-to-git-latest 
added support for rev branch when using deepth parameter
 2014-12-18 09:39:45 -07:00
Thomas S Hatch
5f8d76bff9 Merge pull request #19069 from smoothify/allow_symlink 
Add allow_symlink argument to allow enforcing real directories.
 2014-12-18 09:37:48 -07:00