Seth House
2b5bed43b9
Add integration test for logging out of the rest_cherrypy app
2014-08-15 09:45:30 -04:00
Thomas S Hatch
19e0a8fb3b
Merge pull request #15007 from UtahDave/2014.7fixwinunicode
...
use unicode strings
2014-08-15 00:05:10 -06:00
Thomas S Hatch
1fc7f2edab
Merge pull request #15005 from cachedout/auth_no_check
...
Optimize auth
2014-08-15 00:04:45 -06:00
Thomas S Hatch
53156f6b72
Merge pull request #15004 from rallytime/ps_test_fix
...
Don't stacktrace with old versions of psutil on certain functions
2014-08-15 00:04:18 -06:00
Thomas S Hatch
2036f00ad0
Merge pull request #14999 from nshalman/fix-ssh-shim-esky
...
lack of ssh_py_shim.py breaks esky builds
2014-08-15 00:03:07 -06:00
Thomas S Hatch
062e67943d
Merge pull request #14998 from cachedout/event_block
...
Do not use non_blocking mode on master event bus
2014-08-15 00:01:48 -06:00
Thomas S Hatch
ebfdb1ecb5
Merge pull request #14997 from rallytime/api_wheel_fix
...
Change self.wheelclient.w_funcs to self.wheelclient.functions
2014-08-15 00:00:48 -06:00
Thomas S Hatch
2f61f8bedc
Merge pull request #14937 from basepi/yamldates14860
...
Add additional example for datetime YAML idiosyncrasy
2014-08-14 23:44:27 -06:00
rallytime
e8fab3d28a
Fix psutil version
2014-08-14 21:22:55 -06:00
rallytime
0683c704dd
Move psutil version check
2014-08-14 21:20:25 -06:00
C. R. Oldham
26d36025f1
Merge pull request #15003 from whiteinge/salt-event_send
...
Replaced event.fire_master_env with event.send; because awesomest
2014-08-14 17:47:47 -06:00
C. R. Oldham
fbf98c8655
Merge pull request #15006 from basepi/2014.1.10release
...
Release 2014.1.10
2014-08-14 17:38:00 -06:00
Colton Myers
8c7d1132c8
Add security advisory to release notes for 2014.1.10
2014-08-14 17:35:27 -06:00
Colton Myers
24c13abc4e
Bump doc version
2014-08-14 17:33:04 -06:00
Mike Place
6589d4dd1b
Optimize auth
...
We were traversing the entire minion data cache on every auth
unnecessarily. This should speed auths up substantially.
2014-08-14 17:13:15 -06:00
Seth House
28d05ea289
Update the event state module to use event.send
2014-08-14 18:59:54 -04:00
David Boucha
e9318e5f6c
use unicode strings
...
Fixes #14695
2014-08-14 16:48:36 -06:00
Seth House
829cef4a01
Replaced event.fire_master_env with event.send; because awesomest
2014-08-14 18:47:07 -04:00
rallytime
8dca2515ee
Skip virtual_memory and swap_memory tests if psutil < 0.6.0
2014-08-14 16:16:38 -06:00
rallytime
f3b5c088ef
Add checks to see if psutil version is new enough
2014-08-14 16:00:45 -06:00
Nicole Thomas
548714fb21
Merge pull request #14994 from saltstack/bp-14990
...
Backport #14990 to 2014.7
2014-08-14 13:47:25 -06:00
Mike Place
63ddb3500f
Do not use non_blocking mode on master event bus
...
In my testing, using the NOBLOCK option in ZeroMQ resulted in an
approx. mesasge loss of between 0.5% and 1.5% across 1M messages
delivered at high-speed. Removing that option resulted in a slight
performance hit but 100% of messages were delivered.
2014-08-14 13:45:28 -06:00
rallytime
2cd229d32b
Change self.wheelclient.w_funcs to self.wheelclient.functions
...
Fixes #14591
2014-08-14 13:43:29 -06:00
Nahum Shalman
53c1cd432b
lack of ssh_py_shim.py breaks esky builds
...
use the .pyc file instead
2014-08-14 15:42:15 -04:00
rallytime
7f170c126f
Remove 'RC1' from GIT_VERSION comparison
2014-08-14 11:06:18 -06:00
rallytime
fe5b8d22ec
Fix gitpillar skipIfs
2014-08-14 10:34:38 -06:00
Colton Myers
92742f7e08
No second person
2014-08-13 17:33:06 -06:00
Thomas S Hatch
2d0d6b508e
Merge pull request #14973 from thatch45/2014.7
...
Better approach to #14955
2014-08-13 17:01:43 -06:00
Thomas S Hatch
c2d2ed68ea
Merge pull request #14971 from whiteinge/doc-names-override
...
Documented the expansion additon to names
2014-08-13 16:54:53 -06:00
Thomas S Hatch
a0d7163abb
Merge pull request #14967 from rallytime/pillar_tests
...
Add skipIfs to pillar tests if GitPillar 0.3.2rc1 or > isn't installed
2014-08-13 16:53:56 -06:00
Thomas S Hatch
3d32a1cb8d
Merge pull request #14964 from whiteinge/salt-npm-env
...
Add env support to npm
2014-08-13 16:48:56 -06:00
Thomas S Hatch
90cd112931
Better approach to #14955
...
We can just detect if the function is there, so that we on;y need
to add it if the kwargs do need to be massaged.
2014-08-13 16:46:04 -06:00
Thomas S Hatch
adcb67b93b
Merge pull request #14955 from mcalmer/zypper-add-expand_repo_def
...
add expand_repo_def needed by states pkgrepo.managed
2014-08-13 16:43:32 -06:00
Seth House
d85791e3ef
Documented the expansion additon to names
...
Added docs for the addition in #13489 .
2014-08-13 18:19:02 -04:00
Thomas S Hatch
cfdaba5a62
Merge pull request #14935 from whiteinge/salt-orchestrate-event
...
Added wait_for_event function to saltmod
2014-08-13 16:05:36 -06:00
Thomas S Hatch
48da5f486d
Merge pull request #14969 from thatch45/2014.7
...
Add template files to manifest so they get included
2014-08-13 15:45:34 -06:00
Thomas S Hatch
b755ed1c84
Add template files to manifest so they get included
...
in python 2.6 builds because package_data was changed in 2.7
2014-08-13 15:44:25 -06:00
rallytime
496cfe25b3
Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed
2014-08-13 14:14:53 -06:00
Seth House
8f8cb959e0
Also pass runas and env through to npm.list
2014-08-13 15:34:30 -04:00
Seth House
aafc061e26
Added an env arg to npm module & state
...
Because npm can be configured using env vars.
2014-08-13 13:45:42 -04:00
Thomas S Hatch
2aa208f636
Merge pull request #14930 from whiteinge/doc-event-fire_master_env-sudo
...
Update event.fire_master_env docstring with sudo instructions
2014-08-13 10:38:39 -06:00
Thomas S Hatch
80a7c85b03
Merge pull request #14901 from Nibbler999/fix-custom-grains-override
...
Fix custom grains override
2014-08-13 10:35:26 -06:00
Colton Myers
6e3a83fbad
Merge pull request #14931 from basepi/rcdocs
...
Add installation docs for Salt release candidate
2014-08-13 10:25:23 -06:00
Thomas S Hatch
35b654c2c5
Merge pull request #14942 from UtahDave/2014.7temp
...
Fix unicode output error on Windows salt-call
2014-08-13 09:54:38 -06:00
Joseph Hall
6a0bfbf11f
Merge pull request #14959 from s0undt3ch/2014.7
...
Remove unused imports and fix white-space lint issues.
2014-08-13 09:43:29 -06:00
Pedro Algarvio
c3b064b717
Remove unused imports and fix white-space lint issues.
2014-08-13 16:42:36 +01:00
Michael Calmer
97b2292831
fix pylint add extra line
2014-08-13 15:59:15 +02:00
Michael Calmer
184bf5f881
add expand_repo_def needed by states pkgrepo.managed
2014-08-13 15:14:28 +02:00
Joseph Hall
25352b93a9
Merge pull request #14954 from mcalmer/fix-zypper-set-autorefresh
...
fix set autorefresh in zypper module
2014-08-13 07:10:59 -06:00
Michael Calmer
fd8f0370bf
fix set autorefresh in zypper module
...
fix:
"Failed to configure repo '<reponame>': in method
'RepoInfoBase_setAlias', argument 2 of type 'std::string const &'"
2014-08-13 14:59:29 +02:00
