rallytime
0683c704dd
Move psutil version check
2014-08-14 21:20:25 -06:00
Colin Johnson
41c51b4044
resolve issue with Ubuntu 12.0.4 failures
2014-08-15 01:12:43 +00:00
Seth House
d4c87afac7
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-08-14 19:48:40 -04: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
Colton Myers
0af22fcb19
Merge branch '2014.7' into develop
2014-08-14 17:39:10 -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
Seth House
7335f1ca27
Merge pull request #15002 from techhat/http
...
Linting for #15000
2014-08-14 17:41:05 -04:00
Joseph Hall
0229ef1cb7
Linting for #15000
2014-08-14 14:57:27 -06:00
Seth House
005369f553
Merge pull request #15000 from techhat/http
...
Adding http libraries and modules
2014-08-14 16:37:16 -04:00
Colton Myers
7efba281ef
Merge branch '2014.7' into develop
2014-08-14 14:32:13 -06:00
Joseph Hall
725f2d8969
Typo correction
2014-08-14 14:31:25 -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
Joseph Hall
8b0d01c827
Merge pull request #14993 from nmadhok/patch-2
...
Correct version added and depricated
2014-08-14 13:44:29 -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
Joseph Hall
130755c0b1
Adding http libraries and modules
2014-08-14 13:33:12 -06:00
Nitin Madhok
9619273049
Correct version added and depricated
...
Fixes https://github.com/saltstack/salt/issues/14983
2014-08-14 14:32:13 -04:00
Pedro Algarvio
9134a69dc1
Merge pull request #14990 from rallytime/gitpillar_tests
...
Fix gitpillar skipIfs
2014-08-14 18:44:29 +01:00
rallytime
7f170c126f
Remove 'RC1' from GIT_VERSION comparison
2014-08-14 11:06:18 -06:00
steve
091c40df21
save
2014-08-14 12:40:27 -04:00
rallytime
fe5b8d22ec
Fix gitpillar skipIfs
2014-08-14 10:34:38 -06:00
Branden Timm
4f411006db
Fixed example usage in docstring for grains.filter_by
2014-08-14 11:06:45 -05:00
rallytime
399c022233
Remove unused argument from boto_cloudwatch_alarm.absent
...
Fixes #14925
2014-08-14 09:29:34 -06:00
Jon Henry
c065ac4f50
Fix gem unit test with new proxy parameter
2014-08-14 00:22:52 -06:00
Jon Henry
599917e9c5
Issue 14304: add proxy parameter to gem state
2014-08-13 23:32:42 -06:00
Colton Myers
92742f7e08
No second person
2014-08-13 17:33:06 -06:00
Thomas S Hatch
53fed2cc63
Merge branch '2014.7' into develop
2014-08-13 17:02:19 -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
Seth House
d6818325c8
Add mention of the `names` expansion to the 2014.7 release notes
...
Refs #14971
2014-08-13 19:01:21 -04:00
Seth House
e2ed04351d
Merge remote-tracking branch 'upstream/2014.7' into develop
...
Conflicts:
salt/modules/npm.py
2014-08-13 18:56:23 -04:00
Thomas S Hatch
d6b8fb21c6
Merge pull request #14972 from thatch45/josemine-develop
...
Merge #14941 with fixes
2014-08-13 16:55:24 -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
180c939a53
Merge pull request #14966 from avandendorpe/patch-1
...
Fixed "previous releases" docs link
2014-08-13 16:52:55 -06:00
Thomas S Hatch
73c5b600a6
fix perms on proxmox.py
2014-08-13 16:51:11 -06:00
Thomas S Hatch
edc374fac7
Merge pull request #14965 from syphernl/fix/proxmox_deletes
...
Salt-cloud: Fix Proxmox VM deletions
2014-08-13 16:50:19 -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
Thomas S Hatch
288b57b642
Merge pull request #14950 from gravyboat/develop
...
Add versionadd to postgres_extension, update troubleshooting guides to explain timeouts, pull slspath from best_practices
2014-08-13 16:39:02 -06:00
