valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
39,207 Commits 24 Branches 182 Tags 341 MiB
fb5e86aaa1
Commit Graph

39207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Inflianskas
fb5e86aaa1 modules.linux_acl: satisfy pylint 2014-11-04 16:17:35 +03:00
Roman Inflianskas
83b760db44 modules.linux_acl: add integration tests 2014-11-04 14:45:23 +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
Thomas S Hatch
0cc4b8e044 Merge pull request #17131 from thatch45/isbm-salt-xfs 
Merge #17111 with fixes
 2014-11-03 22:24:49 -07:00
Thomas S Hatch
c7e638842d Merge pull request #17120 from cachedout/issue_17000 
Move the scheduler to its own process
 2014-11-03 22:24:25 -07:00
Thomas S Hatch
47f173833d Merge pull request #17128 from thatch45/ror6ax-drbd 
Merge #17072
 2014-11-03 21:12:55 -07:00
Thomas S Hatch
c3cd55c2b0 Merge pull request #17125 from dmyerscough/yubikey-authentication 
YubiKey Authentication
 2014-11-03 21:12:14 -07:00
Thomas S Hatch
e0904c5b17 Merge pull request #17114 from holmboe/man-clarify 
Some clarifications mainly in the Salt man page
 2014-11-03 21:02:33 -07:00
Thomas S Hatch
b434928e01 Merge pull request #17112 from sbworth/templates-sls-double-fix 
Remove doubled up code for adding slspath variants to template context
 2014-11-03 21:01:25 -07:00
Thomas S Hatch
30af132629 lint 2014-11-03 20:59:28 -07:00
Thomas S Hatch
e5900e5bcc Merge branch 'salt-xfs' of https://github.com/isbm/salt into isbm-salt-xfs 2014-11-03 20:53:37 -07:00
Thomas S Hatch
d10f440155 Merge branch 'jacksontj-develop' into develop 2014-11-03 20:50:06 -07:00
Thomas S Hatch
566d4c0f28 lint 2014-11-03 20:49:50 -07:00
Thomas S Hatch
1b07eab579 Merge branch 'develop' of https://github.com/jacksontj/salt into jacksontj-develop 2014-11-03 20:49:16 -07:00
Thomas S Hatch
c6326394c6 Merge pull request #17106 from mgwilliams/loader 
add function to loader for loading utility modules (_utils)
 2014-11-03 20:45:19 -07:00
Thomas S Hatch
9a96ed63f7 Merge pull request #17102 from rominf/parted-tests 
Actually testing parted
 2014-11-03 20:42:49 -07:00
Thomas S Hatch
87e9db4de8 Merge pull request #17098 from mgwilliams/ret_config 
fix returner config bug
 2014-11-03 20:41:41 -07:00
Thomas S Hatch
74edf77b8a Merge pull request #17129 from saltstack/revert-17093-returner-overwrites-attrs 
Revert "salt.returners.get_returner_options attributes are always overwr...
 2014-11-03 20:40:58 -07:00
Thomas S Hatch
27d4c74b1b Revert "salt.returners.get_returner_options attributes are always overwritten with a blank dictionary" 2014-11-03 20:40:50 -07:00
Thomas S Hatch
737779ea2e Merge pull request #17093 from dmyerscough/returner-overwrites-attrs 
salt.returners.get_returner_options attributes are always overwritten with a blank dictionary
 2014-11-03 20:39:38 -07:00
Thomas S Hatch
5b7fd54a0e Merge pull request #17091 from garethgreenaway/network_routes 
Adding network.route and network.default_route functions to network module.
 2014-11-03 20:33:57 -07:00
Thomas S Hatch
1bcedaaada Merge pull request #17087 from umireon/dockerio-nsenter-erroneously-take-option 
module/dockerio: Separate nsenter argument and command
 2014-11-03 20:32:57 -07:00
Thomas S Hatch
ae6642a909 lint 2014-11-03 20:29:35 -07:00
Thomas S Hatch
1cdd18fbb3 Merge branch 'drbd' of https://github.com/ror6ax/salt into ror6ax-drbd 2014-11-03 20:27:09 -07:00
Thomas S Hatch
0b9831f672 Merge pull request #17127 from thatch45/win_faq 
Add comment to clarify confusion in faqs
 2014-11-03 20:25:35 -07:00
Thomas S Hatch
bc7217c331 Add comment to clarify confusion in faqs 2014-11-03 20:24:44 -07:00
Joseph Hall
7707eb66b4 Merge pull request #17099 from mgwilliams/memcache_return 
fix memcache_return
 2014-11-03 20:22:24 -07:00
Thomas S Hatch
bc62a9ff7b Merge pull request #16988 from lomeroe/fix-win_groupadd 
Added 'adduser', 'deluser', and 'members' functions.  Changed all code t...
 2014-11-03 20:21:43 -07:00
Thomas S Hatch
b461505a73 Merge pull request #16905 from thatch45/state_req 
Add the ability to set state requests
 2014-11-03 20:17:58 -07:00
Thomas S Hatch
e98e77c6ed Merge pull request #17123 from rallytime/revert_16861 
Revert PR #16861
 2014-11-03 20:17:19 -07:00
Damian Myerscough
94d277f897 YubiKey Authentication 2014-11-03 18:33:02 -08:00
Matthew Williams
e726dcf01f fix lint for memcache returner 2014-11-04 02:27:24 +00:00
rallytime
5b2cb4fb8f Revert "Add test.assertion" 
This reverts commit b178a55864.

Conflicts:
	salt/modules/test.py
 2014-11-03 17:50:26 -07:00
Thomas S Hatch
bc5e6f5822 lint and cli example for request 2014-11-03 16:52:42 -07:00
Colton Myers
dd67f54abe Merge branch '2014.7' into develop 
Conflicts:
	setup.py
 2014-11-03 16:42:29 -07:00
rallytime
ce7328c958 Revert "Use sys.__excepthook__ to be pythonic. cc: s0undt3ch" 
This reverts commit f9694749d2.
 2014-11-03 16:40:26 -07:00
rallytime
b10e1037f6 Revert "Route module exceptions back to the master" 
This reverts commit 561bbdf865.

Conflicts:
	salt/utils/error.py
 2014-11-03 16:38:39 -07:00
rallytime
dc8c7b0ff6 Revert "Register error handlers with reactor as callbacks" 
This reverts commit 59d5c47c7d.
 2014-11-03 16:38:04 -07:00
rallytime
69398ffa87 Revert "Support job data" 
This reverts commit 9db48612ae.

Conflicts:
	salt/utils/error.py
 2014-11-03 16:37:53 -07:00
rallytime
511a67e67e Revert "Workflow to display minion exceptions in LocalClient" 
This reverts commit 76eb34c62c.
 2014-11-03 16:36:52 -07:00
rallytime
70d91ed480 Revert "Lint fixes" 
This reverts commit 9540ca48a8.

Conflicts:
	salt/utils/error.py
 2014-11-03 16:36:21 -07:00
Thomas S Hatch
0bbe01b2f0 Merge pull request #16937 from terminalmage/issue16285 
Force VCS fileserver backend config values to be loaded as strings
 2014-11-03 16:30:40 -07:00
Thomas S Hatch
91d1c9f4b0 Merge pull request #17122 from thatch45/isbm-salt-zypper-improvements 
merge #16933
 2014-11-03 16:29:49 -07:00
Mike Place
d69eab9a60 Move the scheduler to its own process 
Fixes #17000
 2014-11-03 16:13:52 -07:00
ror6ax
b8ccd012ca more lint fixes 2014-11-04 00:33:19 +02:00
ror6ax
ef0bfe252f more lint fixes 2014-11-04 00:22:09 +02:00
Thomas S Hatch
fb1d4a83dc lint 2014-11-03 15:03:49 -07:00