valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,829 Commits 24 Branches 182 Tags 341 MiB
4c35e8182f
Commit Graph

55829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerzy Drozdz
821c360c12 Added uuid, dhcpv6c, ipv4_failure_fatal, nickname(NAME in conf file) options 2015-07-08 17:01:05 +02:00
Mike Place
98e4fde483 Merge pull request #25234 from krak3n/fix/boto_asg_update_args 
Fix: Bug in boto_asg state argument passing to boto_asg module
 2015-07-08 08:59:26 -06:00
Mike Place
3adfcf26fb Merge pull request #25227 from nmadhok/doc-fix 
Changing the way links look on the index page
 2015-07-08 08:57:28 -06:00
Mike Place
5db000d9ca Merge pull request #25222 from rallytime/bp-25219 
Back-port #25219 to 2015.8
 2015-07-08 08:55:17 -06:00
Dmitry Kuzmenko
ca233e56e5 RunnerClient support old style commands with kwargs on top level. 
1. Use low['args'] low['kwargs'] if specified and not empty in the low data.
2. Lookup root level and set kwargs in low data if missing.
 2015-07-08 17:53:46 +03:00
Dmitry Kuzmenko
96ab4e1607 Revert "Fixed GET /jobs/<id> requests" 
This reverts commit 954ba6eba9.
 2015-07-08 17:53:46 +03:00
Rafael Uzarowski
62b6d4faef Make SourceDestCheck flag available to network interface definition 2015-07-08 16:44:59 +02:00
Jerzy Drozdz
8d642229c6 Merge remote-tracking branch 'upstream/develop' into rh_int_conf_opts 2015-07-08 16:41:37 +02:00
Jerzy Drozdz
a2b3f3eca5 PyLint problems fix 2015-07-08 16:40:57 +02:00
Dmitry Kuzmenko
0c5e53b6e1 Minor bugfixes in pillarenv support 2015-07-08 17:38:38 +03:00
Pedro Algarvio
c0be10a979 Merge pull request #25232 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-08 14:57:50 +01:00
Chris Reeves
3da8d7e290 Fixed bug with argument passing from boto_asg state to boto_asg module 
Specifically updating an existing auto scale group passed positional
arguments to keyword arguments resulting in the wrong arguments
end up in the wrong place in the module call.
 2015-07-08 14:08:12 +01:00
Pedro Algarvio
39c1e32f47 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-08 11:47:25 +01:00
Paul Sellars
6dbaab32f9 [25230] Change LXC version to come from lxc-info 
Fix for:
https://github.com/saltstack/salt/issues/25230

Seems lxc-ls isn't reliable to get a version, it 'may' return a version if there is already a container created, but from a blank state there's nothing coming back.
 2015-07-08 11:02:39 +01:00
Arthur Lutz
82ef59dbd0 pylint fix 2015-07-08 09:11:46 +02:00
Nitin Madhok
d6d62c1160 Changing the way links look on the index page 2015-07-08 02:54:52 -04:00
Nitin Madhok
02c4ef653f Forgot to correct the spelling 2015-07-08 02:25:41 -04:00
Nitin Madhok
331b27712c Backporting fix for issue #25223 on 2015.8 branch 2015-07-08 02:24:29 -04:00
Nitin Madhok
391b7d6730 Backporting fix for issue #25223 on 2015.2 branch 2015-07-08 02:19:45 -04:00
Nitin Madhok
a1c4eaddd5 Fixing issue which caused Runtime Errors because of changing the list which is being looped over. Fixes #25223 2015-07-08 02:14:15 -04:00
Jacob Hammons
0a46dc4c40 Built man page for spm, added man page entry for spm to doc/conf.py 
Refs #25213
 2015-07-07 20:48:58 -06:00
Nicole Thomas
49b249e9b6 Merge pull request #25219 from jacobhammons/spm-man-page 
Built man page for spm, added man page entry for spm to doc/conf.py
 2015-07-07 20:46:52 -06:00
Jacob Hammons
98d7867957 Built man page for spm, added man page entry for spm to doc/conf.py 
Refs #25213
 2015-07-07 16:54:26 -06:00
Justin Findlay
207fbaeac4 Merge pull request #25214 from rallytime/http_doc 
A couple of doc fixes for the http tutorial
 2015-07-07 16:23:07 -06:00
rallytime
d0b61f3fc1 A couple of doc fixes for the http tutorial 2015-07-07 15:12:36 -06:00
Thomas S Hatch
9dd5cd8a8e Merge pull request #25194 from rallytime/fix-24272 
Update moto version check in boto_vpc_test and update min version
 2015-07-07 12:27:32 -06:00
Thomas S Hatch
2b02315d73 Merge pull request #25198 from cbuehler/patch-2 
extend return on error to enable usage with salt.states.module
 2015-07-07 12:27:09 -06:00
Thomas S Hatch
b781b595fa Merge pull request #25200 from geneseven/develop 
solve the issue of add_host. If the name had already one more recored…
 2015-07-07 12:26:10 -06:00
Thomas S Hatch
ca2e55abd8 Merge pull request #25209 from wcbzero/develop 
Fixed bug report link. Old link was 404
 2015-07-07 12:24:35 -06:00
Thomas S Hatch
ed5c788dcd Merge pull request #25197 from kottenator/patch-1 
Update salt/auth/pki.py
 2015-07-07 12:19:20 -06:00
Mike Place
6fe7ebd583 Merge pull request #25188 from rallytime/linode_logs 
Use linode status descriptions instead of ints when logging status to CLI
 2015-07-07 11:08:02 -06:00
Bill Britt
8c7ec4a4bd Fixed bug report link. Old link was 404 2015-07-07 09:36:14 -07:00
Mike Place
1b2d43806c Merge pull request #25203 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Added DictConfig with tests & More tests
 2015-07-07 10:32:52 -06:00
Mike Place
cebf56c870 Merge pull request #25204 from viktorkrivak/develop 
Fix list render in apache
 2015-07-07 10:31:40 -06:00
Mike Place
c7328c0f67 Merge pull request #25208 from techhat/spmdocs 
Should be FORMULA, not FORMULA.yml
 2015-07-07 10:31:05 -06:00
Joseph Hall
d7f6f3a2a9 Should be FORMULA, not FORMULA.yml 2015-07-07 10:23:45 -06:00
Colton Myers
a3e9486c28 Merge pull request #25205 from basepi/releasecandidatedocs 
Update releasecandidate docs
 2015-07-07 09:25:24 -06:00
Colton Myers
452880d4aa Update releasecandidate docs 2015-07-07 09:24:57 -06:00
Pedro Algarvio
08e454bfa8 Dedent and strip description if equal to docstring 2015-07-07 15:46:51 +01:00
Viktor Krivak
8cf047333d Fix list render in apache 
Fix rendering list to lines in apache module.
Render 
RewriteRule:
        - '^/a(.*) https://domani_a.com [R]'
        - '^/b(.*) https://domain_b.com [R]'

as 
RewriteRule ^/a(.*) https://domani_a.com [R]
RewriteRule ^/b(.*) https://domain_b.com

rather than 
RewriteRule ^/a(.*) https://domani_a.com [R]  ^/b(.*) https://domain_b.com

join all list on single line, which I don't think have any use in apache conf
 2015-07-07 16:10:58 +02:00
Pedro Algarvio
f36123c4df ArrayConfig must have items passed. Added DictConfig with tests. 2015-07-07 15:10:16 +01:00
rallytime
f959e165a1 Clean up imports 2015-07-07 06:28:10 -06:00
rallytime
fbc9c0d6bf Fix Pylint 2015-07-07 05:43:00 -06:00
Jerzy Drozdz
9fbec21aba Changed prefix/netmask to optional 2015-07-07 13:19:48 +02:00
Jerzy Drozdz
a71541bdab Added more ip config options for Ethernet interface 2015-07-07 13:17:45 +02:00
Pedro Algarvio
884212532a Add test for subclassed Configuration classes 2015-07-07 10:45:29 +01:00
Christian Bühler
5f7b9ab30d fixed another typo 2015-07-07 09:52:47 +02:00
Christian Bühler
4c76419a9f fix typo 2015-07-07 09:05:50 +02:00
gene
a526fe2ee4 match pylint rule 2015-07-07 14:19:08 +08:00
gene
f0dbbd5d6c Don't need to update when replace is True and record is exist in dns server 2015-07-07 12:07:41 +08:00