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
55,437 Commits 24 Branches 182 Tags 341 MiB
588d4e1b26
Commit Graph

55437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
588d4e1b26 More Beryllium references changed to 2015.8.0 2015-07-08 11:11:29 -06:00
rallytime
b24911a3e1 More Beryllium --> 2015.8.0 version reference changes 2015-07-08 10:57:43 -06:00
rallytime
abfae94e1d Started changing Beryllium references to 2015.8.0 2015-07-08 10:01:03 -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
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
Pedro Algarvio
08e454bfa8 Dedent and strip description if equal to docstring 2015-07-07 15:46:51 +01:00
Pedro Algarvio
f36123c4df ArrayConfig must have items passed. Added DictConfig with tests. 2015-07-07 15:10:16 +01:00
Pedro Algarvio
884212532a Add test for subclassed Configuration classes 2015-07-07 10:45:29 +01:00
Justin Findlay
f4758bd439 Merge pull request #25189 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-07-06 18:59:17 -06:00
Justin Findlay
3334cf604a Merge pull request #25184 from rallytime/bp-25126 
Back-port #25126 to 2015.8
 2015-07-06 18:57:32 -06:00
Colton Myers
9fde9df55b Remove tests (glance rewrite requires test rewrite) 2015-07-06 14:13:15 -06:00
Colton Myers
adcffc0af8 Move non-glance imports out of the try:except: block 2015-07-06 14:12:44 -06:00
Colton Myers
785f1575e8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/fileclient.py
    salt/modules/glance.py
 2015-07-06 12:03:11 -06:00
Pedro Algarvio
8aac9c92dc Merge pull request #25172 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Comment out imports while the YAML and RST rendering is not in-place.
 2015-07-06 18:25:57 +01:00
rallytime
300a1f2711 Use linode status descriptions instead of ints when logging status to CLI. 2015-07-06 11:09:12 -06:00
Nicole Thomas
3e06602545 Merge pull request #25170 from rallytime/bp-24982 
Back-port #24982 to 2015.5
 2015-07-06 10:34:43 -06:00
Stanislav Blokhin
3ac35a5bff Respect the test flag 2015-07-06 10:14:59 -06:00
Pedro Algarvio
b8f0eca984 Comment out imports while the YAML and RST rendering is not in-place. 2015-07-06 16:26:56 +01:00
Mike Place
09602808a0 Merge pull request #25161 from aneeshusa/allow-checking-non-normalized-systemd-service-availability 
Allow checking for non-normalized systemd units.
 2015-07-06 09:15:31 -06:00
joseph.gimenez@peoplematter.com
3e6eab3ae9 ec2 network_interfaces fix 2015-07-06 09:13:03 -06:00
Mike Place
3599b8abab Merge pull request #25151 from jleroy/ipv6-scope-support 
Support for IPv6 addresses scopes in network.interfaces
 2015-07-06 08:43:03 -06:00
Mike Place
66d6365a9f Merge pull request #25166 from cachedout/lint_saltnado 
Lint #25149
 2015-07-06 08:40:29 -06:00
Mike Place
2fe167edf8 Lint #25149 2015-07-06 08:39:48 -06:00
Mike Place
2f1bad1c01 Merge pull request #25149 from jacksontj/saltnado 
Saltnado multiprocess support
 2015-07-06 08:38:43 -06:00
Aneesh Agrawal
b4d544fe70 Allow checking for non-normalized systemd units. 
When using service.available with the systemd provider, allow appending
the .service suffix for service files, so that service.available('sshd')
and service.available('sshd.service') both are True.
 2015-07-06 07:44:46 -04:00
Pedro Algarvio
e5f77bcff1 Merge pull request #25158 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Comment out not implemented code
 2015-07-06 11:45:11 +01:00
Pedro Algarvio
583a229d98 Comment out not implemented code 2015-07-06 11:44:28 +01:00
Jonathan Leroy
edce034e6c
Support for IPv6 addresses scopes in network.interfaces 2015-07-04 19:22:52 +02:00
Thomas Jackson
6aa5548e2d Enable multiprocess support in saltnado 
The main exception seen is the incompatibility of debug=True and multiprocessing. In addition to that we were initing the event listener (read: zmq sockets) before the fork wich causes other issues. This patch makes rest_tornado fully multiprocess capable.

Feature for #24979
 2015-07-03 16:13:10 -07:00
Thomas Jackson
9a1351eada Change print to logger, so we can set a level and log exc_info 2015-07-03 15:53:31 -07:00
Pedro Algarvio
0cbf22d884 Merge pull request #25145 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Implement `oneOf`, `anyOf`, `allOf` and `not` with unit tests
 2015-07-03 17:56:44 +01:00
Pedro Algarvio
44738b2123 Lint fixes 2015-07-03 17:56:31 +01:00
Pedro Algarvio
f84c3e4fbd Add support for enumNames 2015-07-03 16:40:48 +01:00
Pedro Algarvio
0d9173c57e Remove repeated test 2015-07-03 16:28:57 +01:00
Pedro Algarvio
625e0b6c06 Implement oneOf, anyOf, allOf and not with unit tests 2015-07-03 16:24:46 +01:00
Pedro Algarvio
911862ea44 Merge pull request #25140 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Make the detection code work under Python 3.4
 2015-07-03 00:26:06 +01:00
Pedro Algarvio
c59d43330c Make the detection code work under Python 3.4 2015-07-02 21:08:26 +01:00
Thomas S Hatch
3922992e6b Merge pull request #25131 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Array support in salt.utils.config
 2015-07-02 13:40:34 -06:00
Thomas S Hatch
a723af0f10 Merge pull request #25120 from d--j/patch-2 
add missing continue for exeption case
 2015-07-02 13:38:45 -06:00
Thomas S Hatch
6e2222241a Merge pull request #25117 from basepi/fix.fileclient.is_cached 
Fix fileclient.is_cached
 2015-07-02 13:38:26 -06:00
Thomas S Hatch
c80990ba4f Merge pull request #25087 from 0xf10e/fix_glance_2015.5 
Fix execution module for glance - now based on 2015.5!
 2015-07-02 13:36:27 -06:00
Justin Findlay
dfe3df0dca Merge pull request #25130 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-07-02 13:26:16 -06:00
Colton Myers
38e243fdfb Add fix from merge forward 2015-07-02 11:39:49 -06:00
Colton Myers
549ee47420 Merge pull request #25129 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-07-02 11:37:40 -06:00
Pedro Algarvio
babf0c7f30 Allow config item attributes to be set at the class level 2015-07-02 17:38:06 +01:00
Pedro Algarvio
237023dde0 Support Configuration as an array item 2015-07-02 17:38:06 +01:00
Pedro Algarvio
51e76c3a38 Properly handle salt.utils.config.Null 2015-07-02 17:38:06 +01:00
Pedro Algarvio
e0f4706ef6 Add array support to salt.utils.config (with unit tests) 2015-07-02 17:38:06 +01:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Colton Myers
187268d879 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    setup.py
 2015-07-02 09:42:57 -06:00