Thomas S Hatch
05c93017af
Merge pull request #15080 from cachedout/cp_cleanup
...
Cleanup cp.push and file_recv_max_size options
2014-08-19 16:36:01 -06:00
Thomas S Hatch
6dff3a1ef1
Merge pull request #15035 from UtahDave/2014.7fixhighstateoutputter
...
use unicode strings
2014-08-19 15:03:23 -06:00
Mike Place
e81d69820d
Merge pull request #15081 from cachedout/15077
...
Fix broken link
2014-08-19 13:24:21 -06:00
Mike Place
e2790afe31
Fix broken link
...
Closes #15077
2014-08-19 11:54:16 -06:00
Mike Place
2cb1daa1c0
Cleanup cp.push and file_recv_max_size options
2014-08-19 10:32:01 -06:00
Pedro Algarvio
3644f4f476
Merge pull request #15046 from sylphid8/patch-1
...
correct invalid xmlrpclib auth
2014-08-18 05:36:15 +01:00
sylphid8
a25394d7a3
correct invalid xmlrpclib auth
...
Same as #15001 , but for pillar this time.
2014-08-16 13:47:40 -05:00
Thomas S Hatch
02da0dda32
Merge pull request #15016 from whiteinge/netapi-fix-logout
...
Add tests and a fix for the rest_cherrypy logout view
2014-08-15 23:20:35 -06:00
Thomas S Hatch
199afaebb6
Merge pull request #15011 from garethgreenaway/schedule_returner_fix
...
Fixes to returners.
2014-08-15 23:18:13 -06:00
Thomas S Hatch
e071924b31
Merge pull request #15001 from sylphid8/patch-1
...
correct invalid xmlrpclib auth
2014-08-15 23:14:12 -06:00
Pedro Algarvio
b8b548a655
Update 'doc/.tx/config' - Build #144
...
http://cookingwithsalt.org/job/salt/job/transifex/144/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-08-16 05:01:19 +01:00
David Boucha
a2d1cfa5b0
add unicode prefix to some strings
2014-08-15 16:35:02 -06:00
Colton Myers
34ac4fb713
Merge pull request #15017 from whiteinge/doc-state-event
...
Documentation cleanup and fix for the event state module
2014-08-15 16:32:29 -06:00
Erik Johnson
48e5c3de7f
Merge pull request #15034 from cachedout/payload_typo
...
Fix IPv4 typo
2014-08-15 17:29:20 -05:00
Pedro Algarvio
9de350850f
Merge pull request #15027 from rallytime/fix_lxc_tests
...
Make lxc tests run!
2014-08-15 23:28:19 +01:00
Gareth J. Greenaway
438b06e95a
Fixing returners that use configuration options from config.options to work as returners for the salt schedulers. The __salt__ variable is unavailable when the returner is run from a scheduled job so we pull the configuration values out of __opts__ instead.
2014-08-15 13:49:55 -07:00
David Boucha
750d6aa9d0
use unicode strings
...
Partially Fixes #14695
2014-08-15 14:43:49 -06:00
Mike Place
3bb602104c
Fix IPv6 typo
2014-08-15 14:30:44 -06:00
rallytime
b8db5ff56b
Change lxc skipIf message to be more helpful
2014-08-15 14:21:09 -06:00
rallytime
396a4de7c5
Make lxc tests run!
2014-08-15 11:09:20 -06:00
Joseph Hall
9b975ea28d
Merge pull request #15014 from mcalmer/fix-zypper-url-getter
...
return only one url
2014-08-15 07:53:00 -06:00
Seth House
d671bd2002
Don't process request data on logout for rest_cherrypy module
...
There is no request data when logging out so this was returning a 500
reponse.
Fixes #15015
2014-08-15 09:45:30 -04:00
Seth House
2b5bed43b9
Add integration test for logging out of the rest_cherrypy app
2014-08-15 09:45:30 -04:00
Michael Calmer
bcdbaab716
return only one url
...
needed for test=True where compare one URL with an array of URLs failed
2014-08-15 14:36:22 +02:00
Seth House
da8fc07a7c
Fix incorrect function name in event state module example
2014-08-15 08:31:09 -04:00
Seth House
12e87f3545
Don't document the state.event function aliases
2014-08-15 08:31:08 -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
sylphid8
1bd6c90bf3
correct invalid xmlrpclib auth
2014-08-14 14:58:24 -05: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
