valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
17,786 Commits 24 Branches 182 Tags 341 MiB
8fccb5cce7
Commit Graph

17786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
8fccb5cce7 Merge pull request #7248 from jcockhren/add_global_flag_git_config 
Add global flag git config
 2013-09-14 20:39:39 -07:00
Pedro Algarvio
b8dcf5e085 Merge pull request #7251 from terminalmage/docs 
Audit module documentation (U to W)
 2013-09-14 20:26:55 -07:00
Erik Johnson
79557cda84 Audit module documentation (U to W) 
This commit continues the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com.
 2013-09-14 22:15:45 -05:00
Jurnell Cockhren
715c152815 Allow user to use the '--global' flag for git config settings. 
This resolves #7156
By default 'is_global' is set to False.
Side Effects: Each call to config_set includes the '--local' or '--global'
flags.
 2013-09-14 20:55:54 -05:00
Jurnell Cockhren
909f0884a8 Merge remote-tracking branch 'upstream/develop' into develop 2013-09-14 20:35:43 -05:00
Pedro Algarvio
5b1f0bcb35 Merge pull request #7246 from s0undt3ch/develop 
Add missing import.
 2013-09-14 11:00:00 -07:00
Pedro Algarvio
87e508f872 Add missing import. 2013-09-14 18:59:31 +01:00
Pedro Algarvio
fbd0e622cc Merge pull request #7245 from ranl/modjk 
fixing modjk.recover_all function
 2013-09-14 10:42:31 -07:00
ranl
a44311a83b Merge remote-tracking branch 'upstream/develop' into modjk 
Conflicts:
	salt/modules/modjk.py
 2013-09-14 19:34:16 +02:00
ranl
f0d918e41c fixing modjk.recover_all function 
(08ddd2ae6d (commitcomment-4093277))
 2013-09-14 19:08:02 +02:00
Joseph Hall
fc94c02204 Merge pull request #7241 from gravyboat/develop 
updates to puppet.py for additional examples, and a fixed comma in cmd.py
 2013-09-14 07:01:31 -07:00
Pedro Algarvio
e538234431 Merge pull request #7243 from s0undt3ch/hotfix/lint 
Lint fixes
 2013-09-14 03:30:57 -07:00
Pedro Algarvio
e50e6de1ba Add missing comma, forgotten in d4b021f2. 2013-09-14 11:29:06 +01:00
Pedro Algarvio
76dd69f3aa Remove white-space. 2013-09-14 11:28:46 +01:00
Forrest Alvarez
59d0a25278 updated puppet.py with an example that has more than one argument, also added missing comma on line 663 that was causing cmd.py to fail 2013-09-14 05:55:33 +00:00
Thomas S Hatch
4a2660a618 Merge pull request #7240 from s0undt3ch/hotfix/minion-config 
Default options do not include `config_dir`. It really should be `conf_file`
 2013-09-13 22:17:50 -07:00
Thomas S Hatch
302e317542 Merge pull request #7237 from hulu/avoid-pip-shadowing 
avoid shadowing `version()` in pip.list_()
 2013-09-13 22:17:21 -07:00
Thomas S Hatch
c457b62206 Merge pull request #7236 from hulu/string-shadowing 
avoid shadowing in salt/utils/__init__.py
 2013-09-13 22:16:57 -07:00
Thomas S Hatch
e19b813f8b Merge pull request #7235 from hulu/top-avoid-shadow 
avoid shadowing `top` within state.show_top()
 2013-09-13 22:16:41 -07:00
Thomas S Hatch
c69558c883 Merge pull request #7234 from hulu/lxc-unused-arg 
lxc_gen_config(): rm unused arg `name`
 2013-09-13 22:16:15 -07:00
Thomas S Hatch
75e003b62f Merge pull request #7224 from dlanderson/shell_test_retcodes 
Add with_retcode option to ShellCase.run_call().
 2013-09-13 22:15:32 -07:00
Thomas S Hatch
aaa243e218 Merge pull request #7223 from s0undt3ch/hotfix/wrong-env-usage 
Wrong env usage
 2013-09-13 22:15:01 -07:00
Thomas S Hatch
99b0984961 Merge pull request #7191 from ranl/modjk 
modjk bulk functions
 2013-09-13 22:14:49 -07:00
Thomas S Hatch
8c1bcc69ef Merge pull request #7162 from olliewalsh/fix_gitfs_root 
Potential for for issue #7152
 2013-09-13 21:51:19 -07:00
Thomas S Hatch
b16517452e Merge pull request #7090 from iquaba/show_timeout 
Display message for unresponsive minions
 2013-09-13 21:50:21 -07:00
Pedro Algarvio
d05acea20f Default options do not include config_dir. It really should be conf_file. 2013-09-14 03:01:24 +01:00
Joseph Hall
8f0d1efe15 Merge pull request #7227 from KennethWilke/develop 
Added keystone service and ec2 handling
 2013-09-13 18:16:51 -07:00
Joseph Hall
31c79dee3f Merge pull request #7230 from terminalmage/conf-file-indentation 
Fix inconsistent indentation in config file templates
 2013-09-13 18:13:22 -07:00
Joseph Hall
3c3ec2570d Merge pull request #7239 from hulu/alternatives-set-shadow 
states.alternatives: avoid shadowing set() built-in type
 2013-09-13 18:11:40 -07:00
Chris Rebert
e9a757e072 states.alternatives: avoid shadowing set() built-in type 2013-09-13 17:46:17 -07:00
Chris Rebert
d99df66782 salt/modules/pip.py:774: [W0621(redefined-outer-name), list_] Redefining name 'version' from outer scope (line 790) 2013-09-13 17:22:21 -07:00
Joseph Hall
3fbc088ee0 Merge pull request #7233 from terminalmage/issue7321 
Remove unused import of salt.modules.service
 2013-09-13 17:10:38 -07:00
Chris Rebert
0e49bc4851 salt/utils/__init__.py:1239: [W0621(redefined-outer-name), parse_kwarg] Redefining name 'string' from outer scope (line 19) 2013-09-13 17:09:55 -07:00
Chris Rebert
e891288d2a salt/modules/state.py:471: [W0621(redefined-outer-name), show_top] Redefining name 'top' from outer scope (line 332) 2013-09-13 16:59:09 -07:00
Chris Rebert
eebb3ed1fc salt/modules/lxc.py:69: [W0613(unused-argument), _gen_config] Unused argument 'name' 2013-09-13 16:55:14 -07:00
Pedro Algarvio
d4b021f22e Also deprecated wrong env usage in the cmd state. 2013-09-14 00:54:10 +01:00
Pedro Algarvio
368aa647bb Warn and deprecate passing a salt environment to env which is to be used for system environment variables. 2013-09-14 00:54:08 +01:00
Erik Johnson
3327638a03 Merge pull request #7232 from hulu/pip-state-tweak 
pip state: despite the name, pkg_list is a dict; initialize accordingly
 2013-09-13 16:47:43 -07:00
Erik Johnson
ae6cb78de5 Remove unused import of salt.modules.service 2013-09-13 18:41:13 -05:00
Chris Rebert
2230a670d0 despite the name, pkg_list is a dict; initialize accordingly 2013-09-13 16:25:33 -07:00
Thomas S Hatch
a5b592e13a Merge pull request #7228 from terminalmage/issue7213 
Remove unused kwargs
 2013-09-13 15:02:50 -07:00
Thomas S Hatch
6e27ae330f Merge pull request #7216 from hulu/pkg-refresh 
pkg mods: latest_version: (1) always allow refresh arg (2) error on invalid kwargs
 2013-09-13 15:02:29 -07:00
Erik Johnson
1986d02756 Merge pull request #7229 from hulu/unused-import 
rm unused imports reported by pylint
 2013-09-13 14:41:01 -07:00
Erik Johnson
46d68c8669 Fix inconsistent indentation in config file templates 
In the config file templates, some parameters are commented out with a
pound sign, and others are commented out using a pound sign and a space.
This has led to some confusion when people uncomment some params to use
them and then there are errors when PyYAML tries to render the data.

This commit makes the commenting of config parameters uniform, using
just a pound sign with no extra space.
 2013-09-13 16:32:21 -05:00
Chris Rebert
83a8b7a68a salt/client/api.py:7: [W0611(unused-import), ] Unused import inspect 2013-09-13 14:21:28 -07:00
Chris Rebert
117f6c6cfa salt/modules/bluez.py:16: [W0611(unused-import), ] Unused import salt 2013-09-13 14:21:28 -07:00
Chris Rebert
282ee3024e salt/modules/useradd.py:19: [W0611(unused-import), ] Unused import _callable 2013-09-13 14:21:28 -07:00
Chris Rebert
ec24c78488 salt/modules/useradd.py:7: [W0611(unused-import), ] Unused import sys 2013-09-13 14:21:27 -07:00
Chris Rebert
c2732a804e salt/states/user.py:31: [W0611(unused-import), ] Unused import salt 2013-09-13 14:21:27 -07:00
Chris Rebert
15090a4e44 salt/modules/mac_user.py:11: [W0611(unused-import), ] Unused import copy 2013-09-13 14:21:27 -07:00