valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +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
Pedro Algarvio
b8f0eca984 Comment out imports while the YAML and RST rendering is not in-place. 2015-07-06 16:26:56 +01:00
Erik Johnson
bd46c875ea Merge pull request #25162 from ticosax/dockerng-fix-pull-force 
[dockerng] Do not call inspect_image if we know the image is not downloaded
 2015-07-06 10:18:16 -05: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
Jason Keene
a891108793 Add docs for key arg in ssh_known_hosts.present 2015-07-06 09:14:28 -06:00
joseph.gimenez@peoplematter.com
3e6eab3ae9 ec2 network_interfaces fix 2015-07-06 09:13:03 -06:00
Nicole Thomas
8df67e14f4 Merge pull request #25088 from supertom/develop 
Update
 2015-07-06 09:02:20 -06:00
Mike Place
365a26f0cb Merge pull request #25167 from cachedout/fix_25115 
Fix tests for #25115
 2015-07-06 08:55:27 -06:00
Mike Place
a67156e34f Fix tests for #25115 2015-07-06 08:54:45 -06:00
Mike Place
0ad03088d1 Merge pull request #25115 from ashangit/add-gem-source-server 
Add gem source server
 2015-07-06 08:52:09 -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
1fcf40fdc8 Merge pull request #25148 from jacksontj/develop 
AsyncPillar wrapper to fix file_client: local minions
 2015-07-06 08:41:25 -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
René Jochum
7c6021465f Feature: Add the posibility to skip the reconfiguration of network interfaces. 
This patch adds the option "noifupdown" to the "network state".
The state wont reconfigure an interface when you set "noifupdown" to a
interface.

I added this because i loose the salt connection on my VPN without it.

Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-06 16:34:57 +02:00
Mike Place
82f64f6005 Merge pull request #25164 from xpender/add-devuan-support 
Support for Devuan
 2015-07-06 08:32:43 -06:00
Marko Kercmar
f2dc29b01c Add Devuan to _OS_FAMILY_MAP and report OS Family Debian 2015-07-06 13:49:04 +00:00
Nicolas Delaby
48f20b9739 Do not call inspect_image if we know the image is not downloaded 2015-07-06 14:01:25 +02: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
6b80e29b61 Merge pull request #25159 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-06 11:47:08 +01:00
Pedro Algarvio
191ac14892 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-06 11:46:03 +01: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
Mike Place
bdf22f8596 Merge pull request #25156 from malept/fix-ref-modules-typos 
Fix typos in execution module docs
 2015-07-05 19:37:04 -06:00
Mark Lee
acc13b657f Fix typos in execution module docs 2015-07-05 18:04:06 -07: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
Thomas Jackson
b9c7003a54 AsyncPillar wrapper to fix file_client: local minions 
Fixes #24440
 2015-07-03 15:22:40 -07:00
Pedro Algarvio
d718adf05f Merge pull request #25146 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-03 19:36:13 +01:00
Pedro Algarvio
926ed97e55 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-03 17:57:36 +01: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
d073b60216 Merge pull request #25141 from s0undt3ch/develop 
Make the detection code work under Python 3.4
 2015-07-03 00:37:10 +01:00
Pedro Algarvio
f6540a8a3c Make the detection code work under Python 3.4 2015-07-03 00:36:34 +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
a50f74ba88 Merge pull request #25139 from saltstack/revert-25136-features/raas-17-salt-cloud-2015.8 
Revert "Make the detection code work under Python 3.4"
 2015-07-03 00:25:45 +01:00
Pedro Algarvio
af304db7e2 Revert "Make the detection code work under Python 3.4" 2015-07-03 01:25:36 +01:00
Pedro Algarvio
8a2a732e74 Merge pull request #25136 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Make the detection code work under Python 3.4
 2015-07-03 00:25:28 +01:00
Pedro Algarvio
c59d43330c Make the detection code work under Python 3.4 2015-07-02 21:08:26 +01:00
Colton Myers
8f91da6d6c Merge pull request #25135 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-07-02 13:43:02 -06: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
7207f76f97 Merge pull request #25128 from stanislavb/archive 
Use cmd_unzip to preserve permissions
 2015-07-02 13:39:36 -06:00
Thomas S Hatch
1d5cfde876 Merge pull request #25126 from stanislavb/develop 
dockerio states respect the test flag
 2015-07-02 13:39:24 -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
03abf8bd33 Merge pull request #25116 from nmadhok/file-replace-count-patch 
Fixing issue where count was being ignored by file.replace
 2015-07-02 13:37:18 -06:00