Thomas S Hatch
9bfb066c2c
Merge pull request #24229 from msteed/issue-24147
...
Fix auth failure on syndic with external_auth
2015-05-29 09:04:06 -06:00
Ben Woodward
6632d06e94
Unset PYTHONHOME when starting the service
...
Means that installing Python on the system shouldn't break Salt
2015-05-29 15:28:35 +01:00
Justin Findlay
19fa43c290
Merge pull request #24234 from jayeshka/quota-states-unit-test
...
adding states/quota unit test case.
2015-05-29 08:14:27 -06:00
Mathieu Le Marec - Pasquet
81f80674a2
lxc: fix old lxc test
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-29 10:19:28 +02:00
Jayesh Kariya
c23356500b
adding states/quota unit test case.
2015-05-29 13:19:33 +05:30
Tarjei Husøy
9097cca099
Add missing jump arguments to iptables module
...
I think this is all the arguments supported.
Also adds test for no-arg options and adds some docs on no-arg.
Point to discuss:
- The --save option crashes with our defined --save option. Probably
no rush since no one's complained so far, but this should be fixed.
Maybe we can rename this one to connsecmark-save, since it only appears
as an option to the CONNSECMARK jump target? Maybe also rename restore
to connsecmark-restore too, for consistency, even though restore
doesn't collide with anything?
2015-05-28 21:24:35 -06:00
Nicole Thomas
e15142c629
Merge pull request #24217 from jfindlay/disable_bad_tests
...
disable intermittently failing tests
2015-05-28 21:08:39 -06:00
Nicole Thomas
ce8e43b774
Merge pull request #24199 from lyft/route53-fix-elb
...
Various fixes for boto_route53 and boto_elb
2015-05-28 21:02:41 -06:00
Nicole Thomas
a43465d235
Merge pull request #24142 from basepi/dictupdate24097
...
Optimize dictupdate.update and add #24097 functionality
2015-05-28 21:00:56 -06:00
Ryan Lane
d8dc9a7b5b
Better unit tests for boto_elb state
2015-05-28 16:52:24 -07:00
Michael Steed
482d1cfc64
Fix auth failure on syndic with external_auth
...
This is totally @thatch45's fix, but if it's broken it's probably my
fault. Refs #24147 .
2015-05-28 17:32:09 -06:00
Colton Myers
5c6e210c8b
Deepcopy on merge_recurse
2015-05-28 17:27:48 -06:00
Thomas S Hatch
526698ba8d
Merge pull request #24208 from jayeshka/ports-states-unit-test
...
adding states/ports unit test case.
2015-05-28 17:06:33 -06:00
Colton Myers
a13c84ade8
Fix None check from #21968
2015-05-28 16:59:58 -06:00
Justin Findlay
6b6280442c
disable intermittently failing tests
...
This commit is to be reverted when #23623 is merged.
2015-05-28 16:23:57 -06:00
Nicole Thomas
d00945fd40
Merge pull request #24219 from jfindlay/zfs_check
...
find zfs without modinfo
2015-05-28 15:07:26 -06:00
Thomas S Hatch
3dc4b85295
Merge pull request #24190 from msteed/issue-23815
...
Fix issue 23815
2015-05-28 14:10:34 -06:00
Justin Findlay
15d401907c
use the salt loader in the zfs mod
2015-05-28 13:58:13 -06:00
Justin Findlay
5599b67a46
try to search for zfs if modinfo is unavailable
...
Fixes #20635 .
2015-05-28 13:55:24 -06:00
Justin Findlay
436634b508
Merge pull request #24211 from rallytime/bp-24205
...
Backport #24205 to 2015.5
2015-05-28 12:28:15 -06:00
Justin Findlay
cc58624c7e
Merge pull request #24212 from terminalmage/clarify-error-msg
...
Clarify error in rendering template for top file
2015-05-28 12:26:19 -06:00
Justin Findlay
9825160b1a
Merge pull request #24213 from The-Loeki/patch-3
...
ShouldFix _- troubles in debian_ip
2015-05-28 12:24:39 -06:00
Ryan Lane
62f214b535
Remove cnames_present test
2015-05-28 10:21:15 -07:00
Colton Myers
071751d13f
Merge pull request #24214 from basepi/2015.5.1release
...
2015.5.1release
2015-05-28 10:23:57 -06:00
Colton Myers
e5ba31b5b5
2015.5.1 release date
2015-05-28 10:19:47 -06:00
Colton Myers
768494c819
Update latest release in docs
2015-05-28 10:19:00 -06:00
Ronald van Zantvoort
a68d515973
ShouldFix _- troubles in debian_ip
...
ShouldFixes regression introduced in #23917 .
See also #23922
Since *ANY* half-decent bridge config on Debians will bork with this bug in, recommend to give this a highish prio
2015-05-28 17:13:57 +02:00
Erik Johnson
ca807fb032
Clarify error in rendering template for top file
...
The current error is slightly ambiguous, this makes it 100% clear that
the problem occured while rendering the top file.
2015-05-28 09:51:07 -05:00
Hazel
23284b5d47
Docstring fix in salt.modules.yumpkg.hold
...
Docstring fix: s/deleted/held/ in salt.modules.yumpkg.hold
2015-05-28 08:37:56 -06:00
Jayesh Kariya
657b709932
adding states/ports unit test case.
2015-05-28 17:11:41 +05:30
Justin Findlay
c2f1fdb244
Merge pull request #24202 from rallytime/bp-24186
...
Backport #24186 to 2015.5
2015-05-27 23:16:48 -06:00
Justin Findlay
8a085a2592
Merge pull request #24192 from rallytime/bp-20474
...
Backport #20474 to 2015.5
2015-05-27 23:16:18 -06:00
Justin Findlay
7cc535bf4a
Merge pull request #24184 from rallytime/bp-24129
...
Backport #24129 to 2015.5
2015-05-27 23:15:08 -06:00
Justin Findlay
eb0af70e5b
Merge pull request #24183 from rallytime/bp-19320
...
Backport #19320 to 2015.5
2015-05-27 23:14:36 -06:00
Tyler Cipriani
db793dd0de
Update salt vagrant provisioner info
...
Also tweaked one piece of confusing verbiage
2015-05-27 21:56:29 -06:00
Nicole Thomas
1b5bf23187
Merge pull request #24201 from whiteinge/rest_cherrypy-client-libs
...
Add list of client libraries for the rest_cherrypy module to the top-level documentation
2015-05-27 20:12:08 -06:00
Seth House
5f718027ca
Add list of client libraries for the rest_cherrypy module
2015-05-27 19:10:48 -06:00
Seth House
28fc77f6f6
Fix rest_cherrypy config example indentation
...
This indentation was erroneously changed in #24185 .
2015-05-27 19:10:33 -06:00
Ryan Lane
7b9ae82951
Lint fix
2015-05-27 17:57:46 -07:00
Ryan Lane
b74b0d1413
Various fixes for boto_route53 and boto_elb
...
* Fix for route53 entries with * in their names
* Have boto_elb use boto_route53's state module directly
* Fix for boto_elb alarms
2015-05-27 16:54:15 -07:00
Nicole Thomas
3307ec20d9
Merge pull request #24195 from rallytime/merge-24185
...
Merge #24185 with a couple of fixes
2015-05-27 16:18:37 -06:00
rallytime
d8daa9dcd7
Merge #24185 with a couple of fixes
...
Refs #24185
2015-05-27 15:25:27 -06:00
Manoli Yiannakakis
fd3c783f3e
add sudo, sudo_password params to deploy to allow for non-root deploys
2015-05-27 14:31:36 -06:00
Nicole Thomas
7e400bc3d7
Merge pull request #24166 from jayeshka/pkgng-states-unit-test
...
adding states/pkgng unit test case.
2015-05-27 14:27:49 -06:00
Nicole Thomas
9fcda79cd4
Merge pull request #24189 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-05-27 14:26:31 -06:00
Jacob Hammons
634d56bca0
Fixed pylon error
2015-05-27 13:45:00 -06:00
Michael Steed
086a1a94e8
lint
2015-05-27 13:36:25 -06:00
Michael Steed
65de62f852
fix #23815
...
- fix stack trace when recurse=True and auto_add=True
- simplify the code a bit
- clean up documentation
2015-05-27 13:32:43 -06:00
Michael Steed
d04e9162de
spelling
2015-05-27 13:32:16 -06:00
Michael Steed
db9f6820b8
add inotify beacon unit tests
2015-05-27 13:26:36 -06:00
