valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,825 Commits 24 Branches 182 Tags 341 MiB
29cd475d30
Commit Graph

27825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
29cd475d30 clean-up after changing user info tests 2014-03-17 13:16:45 -06:00
rallytime
4a8ac5fc51 Merge branch 'develop' of https://github.com/saltstack/salt into mac_user_test 2014-03-17 13:12:11 -06:00
rallytime
e2af3aca24 Integration tests for changing user info in mac_user module 2014-03-17 13:10:36 -06:00
Samuel Smith
5eb6396ad4 Merge pull request #11295 from SmithSamuelM/sam_raet_25 
Sam raet 25 Refactored the service methods of the Udp Uxd stacks.
 2014-03-17 12:47:34 -06:00
Samuel M Smith
af6ef8c86e Merge remote-tracking branch 'upstream/develop' into sam_raet_25 2014-03-17 12:44:44 -06:00
Samuel M Smith
23be4fb9b4 Added .serviceRx and .serviceTx methods to both StackUdp and StackUxd so can split servicing queues into 
two behaviors to better optimize cpu usage
 2014-03-17 12:42:32 -06:00
Samuel M Smith
132f320317 Clean up StackUdp so its naming is consistent with StackUxd 
Added Split service methods
 2014-03-17 12:32:08 -06:00
Thomas S Hatch
b66503f767 whitespace 2014-03-17 12:24:12 -06:00
Thomas S Hatch
276a1f1e05 Fix file perm checker tests 2014-03-17 11:59:09 -06:00
Thomas S Hatch
d018d9ec54 Merge pull request #11288 from mtorromeo/fix/ssh-wrapper-mode 
Fix permissions of the ssh-id-wrapper script
 2014-03-17 11:57:24 -06:00
Joseph Hall
bc742630eb Merge pull request #11289 from hulu/apache-shadowing 
avoid shadowing configfile() func in apache state
 2014-03-17 11:29:19 -06:00
Thomas S Hatch
b779687682 Merge pull request #11285 from cvrebert/patch-1 
states.group: rm unused import `grp`
 2014-03-17 11:29:09 -06:00
Thomas S Hatch
b78a063864 Merge pull request #11286 from cvrebert/patch-2 
fix bad indentation in salt/states/group.py
 2014-03-17 11:29:00 -06:00
Joseph Hall
89242feaf9 Merge pull request #11290 from hulu/keystone-light 
pass along connection_args in modules.keystone.endpoint_create()
 2014-03-17 11:28:50 -06:00
Joseph Hall
f149e00554 Merge pull request #11291 from hulu/apache-config-shadow 
avoid shadowing outer config() func in modules.apache._parse_config()
 2014-03-17 11:28:19 -06:00
Joseph Hall
60ace86a3b Merge pull request #11287 from cvrebert/patch-3 
lint modules/groupadd.py
 2014-03-17 11:25:20 -06:00
Chris Rebert
1342d6bf51 avoid shadowing outer config() func in modules.apache._parse_config() 
************* Module salt.modules.apache
salt/modules/apache.py:381: [W0621(redefined-outer-name), _parse_config] Redefining name 'config' from outer scope (line 410)
 2014-03-17 10:13:32 -07:00
Chris Rebert
ba0466750c pass along connection_args in modules.keystone.endpoint_create() 
************* Module salt.modules.keystone
salt/modules/keystone.py:279: [W0613(unused-argument), endpoint_create] Unused argument 'connection_args'
 2014-03-17 10:08:27 -07:00
Chris Rebert
7e73bcb07d avoid shadowing configfile() func in apache state 2014-03-17 10:01:13 -07:00
Chris Rebert
7ceb4c3dae lint modules/groupadd.py 
************* Module salt.modules.groupadd
salt/modules/groupadd.py:184: [C0304(missing-final-newline), ] Final newline missing
salt/modules/groupadd.py:167: [W0702(bare-except), deluser] No exception type(s) specified
 2014-03-17 09:57:32 -07:00
Massimiliano Torromeo
ba92bb7b81 Fix permissions of the ssh-id-wrapper script 2014-03-17 17:56:31 +01:00
Chris Rebert
40ab8175a0 fix bad indentation in salt/states/group.py 
************* Module salt.states.group
salt/states/group.py:134: [W0311(bad-indentation), ] Bad indentation. Found 16 spaces, expected 12
 2014-03-17 09:55:12 -07:00
Chris Rebert
a4ccb844e4 states.group: rm unused import grp 
************* Module salt.states.group
salt/states/group.py:33: [W0611(unused-import), ] Unused import grp
 2014-03-17 09:53:41 -07:00
Samuel M Smith
ed80502f01 Merge remote-tracking branch 'upstream/develop' into sam_raet_25 2014-03-17 10:46:14 -06:00
Thomas S Hatch
23d7be7628 Revert "minor style for for len usage and one "== None" occurrence" 
This reverts commit 3cc77e21b5.

Conflicts:
	salt/utils/pyobjects.py
 2014-03-17 10:40:10 -06:00
Thomas S Hatch
5c1ae24829 Merge pull request #11196 from mtorromeo/feature/git-ssh 
Implement static git ssh helper
 2014-03-17 10:31:30 -06:00
Thomas S Hatch
5538e216b2 Remove old_present from groups 2014-03-17 10:28:44 -06:00
Thomas S Hatch
955488418f Merge pull request #11108 from mlister2006/develop 
Manipulating Linux /etc/group group members (Ref: Issue# 11102)
 2014-03-17 10:27:53 -06:00
Samuel M Smith
d4861d2cc4 Merge remote-tracking branch 'upstream/develop' into sam_raet_25 2014-03-17 10:25:13 -06:00
Thomas S Hatch
05726ff088 Merge branch 'pyobjects_loader_and_map' of git://github.com/borgstrom/salt into borgstrom-pyobjects_loader_and_map 
Conflicts:
	salt/utils/pyobjects.py
 2014-03-17 10:23:43 -06:00
Thomas S Hatch
da556a1c97 Merge pull request #11268 from JensRantil/issue-11198 
Highstate output improvements
 2014-03-17 10:17:22 -06:00
Thomas S Hatch
10a3f74c0e whitespace 2014-03-17 10:15:31 -06:00
Thomas S Hatch
ea2c4cd297 Merge pull request #11247 from cachedout/11223 
Use root_key if auth'ing as root when token is present.
 2014-03-17 10:14:11 -06:00
Thomas S Hatch
fee3d549c5 Merge pull request #11280 from terminalmage/issue11181 
Fix edge case when rel path changes from file to dir
 2014-03-17 10:13:41 -06:00
Thomas S Hatch
05f87e181c Merge pull request #11282 from rallytime/mac_users_test_fix 
Removed list groups test
 2014-03-17 10:13:16 -06:00
Thomas S Hatch
787a2da48b Whitespace 2014-03-17 10:12:32 -06:00
rallytime
6a54a92aa9 Removed list groups test 2014-03-17 09:55:41 -06:00
Erik Johnson
dbf916f339 Fix edge case when rel path changes from file to dir 
This fixes an edge case in gitfs where a path that once was a file is
now a directory.
 2014-03-17 10:48:53 -05:00
rallytime
d3bc7c800c mac_user integration tests 2014-03-17 09:02:16 -06:00
Joseph Hall
c56f61b1ea Merge pull request #11265 from gtmanfred/passwords 
add functions for generating passwords
 2014-03-17 06:01:15 -06:00
Joseph Hall
c2e9614950 Merge pull request #11269 from JensRantil/file-state-creation-change 
fix(state/file): set 'changes' when creating file
 2014-03-17 05:57:57 -06:00
Joseph Hall
cb0d9804dc Merge pull request #11270 from JensRantil/file-state-populate-changes-on-tchange 
fix(state/file): populate `change` on touch
 2014-03-17 05:56:18 -06:00
Pedro Algarvio
ce6f68afe7 Merge pull request #11278 from techhat/pymongo 
Fix first-person docs
 2014-03-17 11:54:36 +00:00
Joseph Hall
232e78c120 Fix first-person docs 2014-03-17 05:48:56 -06:00
Joseph Hall
4cac907b85 Merge pull request #11261 from CSSCorp/develop 
keystone endpoints state and module methods
 2014-03-17 05:43:11 -06:00
Joseph Hall
7375d9ea7e Merge pull request #11277 from tmartinfr/fix-doc-mongo 
Document PyMongo requirement when using mongo ext_pillar
 2014-03-17 05:39:55 -06:00
Thomas Martin
1256e5c249 Document PyMongo requirement when using mongo ext_pillar 2014-03-17 12:17:44 +01:00
Ageeleshwar
8cd8692d58 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-03-17 13:25:00 +05:30
Thomas S Hatch
8a14df4a96 Detect workers and don't set the listen flag in events 2014-03-17 00:34:45 -06:00
Thomas S Hatch
66ee0e8b2a Set a flag in opts that a worker is running 2014-03-17 00:32:58 -06:00