valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
48,472 Commits 24 Branches 182 Tags 341 MiB
2dd5904119
Commit Graph

48472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
ff6b2a781f Further optimize dictupdate.update() 2015-05-29 17:59:27 -06:00
Colton Myers
c73f5ba37c Remove unused valtype 2015-05-29 17:46:38 -06:00
Thomas S Hatch
3d885c04f0 Merge pull request #24257 from jfindlay/pkg_tests 
fix pkg mod integration test on ubuntu 12.04
 2015-05-29 17:09:00 -06:00
Colton Myers
08a10755b3 Merge pull request #24260 from basepi/lxctypos24080 
Fix some typos from #24080
 2015-05-29 16:54:58 -06:00
Colton Myers
0fa1ad3977 Fix another lxc typo 2015-05-29 16:54:06 -06:00
Colton Myers
669938f28d s/you ll/you'll/ 2015-05-29 16:53:37 -06:00
Colton Myers
75590cf490 Merge pull request #24080 from makinacorpus/lxc_consistency2 
Lxc consistency2
 2015-05-29 16:51:54 -06:00
Justin Findlay
9508924c02 fix pkg mod integration test on ubuntu 12.04 2015-05-29 15:52:57 -06:00
Justin Findlay
da14f3b976 Merge pull request #24247 from rallytime/bp-24220 
Backport #24220 to 2015.5
 2015-05-29 15:40:01 -06:00
Justin Findlay
21d6126c34 Merge pull request #24254 from rallytime/add_deprecation_warning_digitalocean 
Add deprecation warning to Digital Ocean v1 Driver
 2015-05-29 15:39:25 -06:00
Justin Findlay
dac055dd8b Merge pull request #24252 from aboe76/opensuse_package 
Updated suse spec to 2015.5.1
 2015-05-29 15:38:45 -06:00
Justin Findlay
49e7fe8a5e Merge pull request #24251 from garethgreenaway/2015_5_returner_brokenness 
Returners broken in 2015.5
 2015-05-29 15:37:51 -06:00
Joseph Hall
bfb946123e Merge pull request #24255 from rallytime/clarify_digital_ocean_driver_docs 
Clarify digital ocean documentation and mention v1 driver deprecation
 2015-05-29 15:37:07 -06:00
Justin Findlay
41f5756f36 Merge pull request #24232 from rallytime/bp-23308 
Backport #23308 to 2015.5
 2015-05-29 15:36:46 -06:00
rallytime
8d51f75aa5 Clarify digital ocean documentation and mention v1 driver deprecation 
Fixes #21498
 2015-05-29 14:14:19 -06:00
Shane Lee
a95982c722 Merge pull request #24245 from Sacro/patch-2 
This does indeed change the PythonPath just for the service without affecting environment variables for the rest of the system. Thanks for the fix.
 2015-05-29 14:00:31 -06:00
rallytime
cafe37bdf8 Add note to docs about deprecation 2015-05-29 13:20:02 -06:00
rallytime
ea0f1e0921 Add deprecation warning to digital ocean driver to move to digital_ocean_v2 
Digital Ocean's APIv1 is deprecated and will no longer be available starting Nov. 1, 2015.

In Salt Beryllium, the digital_ocean_v2.py driver, which uses Digital Ocean's AIPv2, will
become digital_ocean.py.
 2015-05-29 12:53:50 -06:00
Niels Abspoel
0ad617df21 Updated suse spec to 2015.5.1 2015-05-29 20:26:31 +02:00
Gareth J. Greenaway
5df6b52568 The code calling cfg as a function vs treating it as a dictionary and using get is currently backwards causing returners to fail when used from the CLI and in scheduled jobs. 2015-05-29 11:16:44 -07:00
Manoli Yiannakakis
0b1041dd72 adding key_filename param to vsphere provider 2015-05-29 10:28:36 -06:00
Thomas S Hatch
1504c76d3a Merge pull request #24121 from hvnsweeting/rabbitmq-host-deprecate-set-permission 
deprecate setting user permission in rabbitmq_vhost.present
 2015-05-29 09:55:40 -06:00
rallytime
2733f66449 Import string 2015-05-29 09:54:38 -06:00
Thomas S Hatch
ba02f6509e Merge pull request #24179 from Precis/fix-file-uid-gid-2015.0 
Changing user and group only possible for existing ids.
 2015-05-29 09:52:43 -06:00
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