Mike Place
c2626245e9
yaml no longer loaded by salt.utils
2014-12-09 21:54:56 -07:00
Mike Place
414753a766
Stand-alone zeromq utilities
2014-12-09 21:41:52 -07:00
Mike Place
808e07956f
Avoid unecessary imports of zmq libraries
2014-12-09 21:39:51 -07:00
Mike Place
37d3c23e2d
Fix conflict with merging in reactor changes
2014-12-09 21:28:52 -07:00
Mike Place
14738f2923
Lighten the runtime imports in version.py
2014-12-09 21:19:01 -07:00
Mike Place
4b9be7ed63
Loading salt.utils no longer does a full import of salt.minion
2014-12-09 21:08:23 -07:00
Mike Place
22e7e95d79
Lint (I hope)
2014-12-09 20:54:00 -07:00
Mike Place
dcbd29bdb0
Revert salt.client.ssh import fix
2014-12-09 19:09:01 -07:00
Mike Place
5287a00cba
Forgot one import
2014-12-09 17:48:49 -07:00
Mike Place
d7c904c161
Performance refactor
...
salt '*' test.ping...now with 40,000 fewer function calls!
2014-12-09 17:48:47 -07:00
Colton Myers
ea7af4fb65
Merge branch '2014.7' into develop
2014-12-09 15:59:36 -07:00
Thomas S Hatch
2d48deb074
Merge pull request #18856 from saltstack/revert-18687-develop
...
Revert "Support multiple roots per environment for external pillars S3 a...
2014-12-09 14:56:10 -07:00
Thomas S Hatch
4f3e943d1d
Merge pull request #18854 from kenatbasis/consistent-service-enable
...
Enabled debian services on ubuntu are always enabled
2014-12-09 14:55:20 -07:00
Thomas S Hatch
4260f20f0d
Merge pull request #18861 from thatch45/lomeroe-win_usergroup_adsi_mgmt
...
Merge #18840
2014-12-09 14:53:25 -07:00
Thomas S Hatch
8a719fcb66
lint
2014-12-09 14:50:48 -07:00
Thomas S Hatch
be8d1110fe
Merge branch 'win_usergroup_adsi_mgmt' of https://github.com/lomeroe/salt into lomeroe-win_usergroup_adsi_mgmt
2014-12-09 14:49:50 -07:00
Thomas S Hatch
da14f0f8d7
Merge pull request #18825 from lyft/backport-grain-masterless-nosync
...
Do not sync grains in grains.setval when using local mode
2014-12-09 14:46:20 -07:00
Thomas S Hatch
828ee4df40
Merge pull request #18824 from lyft/connection-draining-for-elb
...
Add support for setting connection draining settings for ELBs
2014-12-09 14:45:47 -07:00
Thomas S Hatch
bcb529f809
Merge pull request #18823 from scalp42/typos
...
Correct some typos
2014-12-09 14:43:15 -07:00
Thomas S Hatch
da14f3218c
Merge pull request #18821 from s0undt3ch/2014.7
...
Remove deprecated pylint options
2014-12-09 14:42:27 -07:00
Thomas S Hatch
5a7f26c994
Merge pull request #18814 from eliasp/2014.7-eselect-improvements
...
2014.7 eselect improvements
2014-12-09 14:40:03 -07:00
Thomas S Hatch
7993f5c826
Merge pull request #18812 from cro/proxy_logic_fix
...
Fix logic error introduced sometime in the past 6 months that prevented ...
2014-12-09 14:39:16 -07:00
Thomas S Hatch
1e9a9aa2fc
Merge pull request #18807 from hulu/develop
...
fix for #18778 (salt-ssh tries to copy file to the filesystem root)
2014-12-09 14:37:28 -07:00
Thomas S Hatch
14459bcec7
Merge pull request #18859 from saltstack/revert-18792-issue17963
...
Revert "Fix jinja search path for local file_client"
2014-12-09 14:34:50 -07:00
Thomas S Hatch
1e71344a98
Revert "Fix jinja search path for local file_client"
2014-12-09 14:34:45 -07:00
Thomas S Hatch
e14d524b53
Merge pull request #18792 from terminalmage/issue17963
...
Fix jinja search path for local file_client
2014-12-09 14:32:24 -07:00
Thomas S Hatch
0cf71ddfb0
lint
2014-12-09 14:31:25 -07:00
Thomas S Hatch
655d067cf8
Merge pull request #18764 from jacksontj/develop
...
Channel/Sreq cleanup
2014-12-09 14:30:22 -07:00
Colton Myers
739d942a18
Merge pull request #18810 from nmadhok/patch-1
...
Fixing bug in salt.modules.zfs.list error return
2014-12-09 14:08:23 -07:00
Nicole Thomas
59ab619c88
Revert "Support multiple roots per environment for external pillars S3 and Git"
2014-12-09 14:04:02 -07:00
Colton Myers
4aa0f47303
Merge pull request #18846 from basepi/servicemodwatchargs
...
Add **kwargs to service.mod_watch
2014-12-09 13:55:35 -07:00
Ethan Moore
640864d92a
more lint fixes
2014-12-09 14:09:44 -06:00
Ken Jung
bd6f5ea370
Enabled debian services on ubuntu are always enabled
...
Right now, 'service: enabled' on ubuntu will call 'update-rc.d defaults' which
will not enable the service if rc.d symlinks already exist. debian services on
debian will call 'update-rc.d enable', this change makes ubuntu consistent with
debian
2014-12-09 11:47:21 -08:00
Pedro Algarvio
e5dc9f5b28
Merge pull request #18849 from techhat/ec2win
...
Copy fixes for Windows Salt Cloud doc
2014-12-09 19:03:20 +00:00
Joseph Hall
25d8cb6560
Copy fixes for Windows Salt Cloud doc
2014-12-09 11:57:35 -07:00
Thomas S Hatch
274aca9b5b
Merge pull request #18844 from rallytime/fix_parted_tests
...
Patch unittests when calling _validate_device
2014-12-09 11:46:58 -07:00
Colton Myers
08d4cbdbe3
Add **kwargs to service.mod_watch
...
Gets rid of warnings about `enable` and `__reqs__` not being supported
by the function
2014-12-09 11:13:16 -07:00
Thomas S Hatch
3d73816507
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/network.py
salt/utils/parsers.py
2014-12-09 10:59:18 -07:00
Thomas S Hatch
37b3e48d13
Merge pull request #18838 from rallytime/fix_archive_tests
...
Fix mocked calls in unit/modules/archive_test.py
2014-12-09 10:55:49 -07:00
Thomas S Hatch
6368bef4e1
Merge pull request #18845 from thatch45/bootstrap_paths
...
Add more paths to syspaths
2014-12-09 10:55:36 -07:00
Thomas S Hatch
2fad613c6f
Add more paths to syspaths
2014-12-09 10:54:38 -07:00
Ethan Moore
44e7bf7b0c
lint fixes
2014-12-09 11:48:15 -06:00
rallytime
8211dc2f00
Patch unittests when calling _validate_device
2014-12-09 10:48:02 -07:00
Elias Probst
b9f5c83b17
Pylint.
2014-12-09 18:20:02 +01:00
Elias Probst
9250786fdf
Add missing import of 'salt.utils'.
2014-12-09 18:19:49 +01:00
Thomas Jackson
d9572d85af
Add required funcs to the baseclass
2014-12-09 08:39:46 -08:00
Thomas Jackson
3186e246c6
Clean up the logic
2014-12-09 08:37:03 -08:00
Thomas Jackson
865c66d583
Add missing import
...
We use it in the ZMQChannel, I'm not sure how this works without the import
2014-12-09 07:55:56 -08:00
Nicole Thomas
48e1df7bee
Merge pull request #18776 from jfindlay/quote_virtualenv
...
unquote venv mod commands
2014-12-09 08:50:32 -07:00
Thomas Jackson
85b4512164
Pylint fix
2014-12-09 07:41:57 -08:00
