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
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
Erik Johnson
cabb0cd8e0
Remove unused kwargs
...
Fixes #7213 .
2013-09-13 15:41:36 -05:00
KennethWilke
576dc565dd
added service and larger example to keystone state
2013-09-13 15:28:19 -05:00
KennethWilke
913bb94dd2
ec2 and service handlers added to keystone
2013-09-13 15:16:44 -05:00
Chris Rebert
bd72e44a2f
pkg mods: latest_version: (1) always allow refresh arg (2) error on invalid kwargs
2013-09-13 11:17:30 -07:00
Joseph Hall
43d04b40a6
Merge pull request #7225 from terminalmage/packaging
...
Fix/update RPM packaging files
2013-09-13 10:56:10 -07:00
Erik Johnson
186c929c51
Fix sanity checks and defaults file sourcing
2013-09-13 12:48:50 -05:00
Erik Johnson
8376fd5284
Updated with 0.16.4-1 info
2013-09-13 12:47:20 -05:00
David Anderson
583d0b8a3e
Add with_retcode options for ShellCase functions
2013-09-13 10:51:25 -06:00
David Anderson
1d7309970f
Add with_retcode option to ShellCase.run_call(). Also adds a test case for https://github.com/saltstack/salt/issues/6973 - expect a non-zero exit code when running "salt-call --retcode-passthrough state.highstate"
2013-09-13 10:12:11 -06:00
Thomas S Hatch
0df7e4fd69
Merge pull request #7222 from s0undt3ch/features/7190-no-reset-system-locale
...
Allow the system locale not to be reset. Fixes #7190 .
2013-09-13 08:11:50 -07:00
Pedro Algarvio
3c0a76a581
Merge pull request #7214 from hulu/apt-deprecate-repo
...
deprecate 'repo' arg to modules.apt.latest_version()
2013-09-13 03:32:22 -07:00
Pedro Algarvio
09c1ac5b10
Allow the system locale not to be reset. Fixes #7190 .
2013-09-13 11:06:54 +01:00
Thomas S Hatch
403f6989d2
Merge pull request #7183 from dlanderson/fix_issue_6785
...
Fix https://github.com/saltstack/salt/issues/6785
2013-09-12 23:42:38 -07:00