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
34,953 Commits 24 Branches 182 Tags 341 MiB
61eb4fb041
Commit Graph

34953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nitin Madhok
61eb4fb041 Fixing YAML state syntax 2014-08-04 21:32:38 -04:00
Joseph Hall
8a3cb618b2 Merge pull request #14727 from seegno/bugfix/multimaster-doc 
Add missing lines between the code block declaration and the body
 2014-08-04 17:55:00 -06:00
Alfredo Palhares
145670b459 Add missing lines between the code block declaration and the body 2014-08-05 00:40:18 +01:00
Pedro Algarvio
8b2cbbb2cc Merge branch '2014.7' into develop 2014-08-04 21:31:49 +01:00
Pedro Algarvio
01c93db2cd __file__ is not set in an exec() context 2014-08-04 21:31:22 +01:00
Thomas S Hatch
a6f35be43d Merge branch '2014.7' into develop 2014-08-04 13:59:22 -06:00
Thomas S Hatch
96314149c2 lint 2014-08-04 13:43:59 -06:00
Thomas S Hatch
995936b66d Merge pull request #14720 from jacksontj/develop 
Add hwm to incoming rep sockets
 2014-08-04 13:42:30 -06:00
Thomas Jackson
c8b9063bed Add hwm to incoming rep sockets 
This will help alleviate problems where clients are unable to auth, and timeout. Those auth requests which "timed out" are still in the master queue and still need to be processed. In ZMQ there is no way to determine if the remote end has disconnected, or still needs the request filled. This will limit the number of requests that are stuck in this backlog state to help alleviate issues when it occurs
 2014-08-04 12:26:45 -07:00
Thomas S Hatch
53f963ba60 lint 2014-08-04 13:13:40 -06:00
Thomas S Hatch
84e0a0b1e3 Lint fixes 2014-08-04 13:07:47 -06:00
Colton Myers
8ceb9b9247 Merge branch '2014.7' into develop 2014-08-04 11:40:16 -06:00
Colton Myers
fab3c235ec Merge pull request #14713 from saltstack/bp-14700 
Backport #14700 to 2014.7
 2014-08-04 11:39:40 -06:00
Daniel Wallace
45c13d621f document the usage of userdata for cloud-init 
closes #14643
 2014-08-04 11:25:20 -06:00
Thomas S Hatch
604b54887a Merge pull request #14710 from whiteinge/state-event-tweaks 
A few updates to the state.event runner
 2014-08-04 11:11:11 -06:00
Thomas S Hatch
c51580e63b Merge pull request #14706 from alejansa/add_compact_output 
Adds compact output method.
 2014-08-04 11:06:25 -06:00
Thomas S Hatch
baa3655ee9 Merge pull request #14705 from NicholasTD07/add_newline_values_only 
Add newline_values_only and flaten output methods.
 2014-08-04 11:04:16 -06:00
Thomas S Hatch
87e88da9a6 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-08-04 11:01:21 -06:00
Thomas S Hatch
fad350cb00 Merge pull request #14711 from thatch45/develop 
Merge #14696 with lint fixes
 2014-08-04 11:00:34 -06:00
Thomas S Hatch
eef5ebe7e3 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-08-04 10:57:57 -06:00
Thomas S Hatch
fd89791d95 Merge pull request #14704 from Learnosity/2014.7 
Add force_reset option to git.latest; fixes #10414
 2014-08-04 10:57:40 -06:00
Thomas S Hatch
d279889abf Merge pull request #14701 from lyft/asg-support-security-group-names 
boto_asg - add support for use of security group names in launch configs
 2014-08-04 10:57:06 -06:00
Thomas S Hatch
2dba861f2a Merge branch 'Setsuna666-feature-glusterfs-add_bricks' into develop 2014-08-04 10:55:09 -06:00
Thomas S Hatch
0ff14dc50b lint in state 2014-08-04 10:54:55 -06:00
Thomas S Hatch
0babc61cec lint in module 2014-08-04 10:54:09 -06:00
Thomas S Hatch
c8505c4fa6 Merge branch 'feature-glusterfs-add_bricks' of https://github.com/Setsuna666/salt into Setsuna666-feature-glusterfs-add_bricks 2014-08-04 10:52:50 -06:00
Colton Myers
451756d406 Merge branch '2014.7' into develop 2014-08-04 10:48:26 -06:00
Thomas S Hatch
68a3a69779 Merge pull request #14688 from xzy3/develop 
Fixed AttributeError in _threaded_return caused when execution modules yield dicts.
 2014-08-04 10:45:42 -06:00
Colton Myers
60d6b00f0f Add pepa.py external pillar from develop to 2014.7 
Ref #14454
Ref #14522
Ref #14538
Ref #14545
Ref #14548
Ref #14592
 2014-08-04 10:44:44 -06:00
Colton Myers
110773535e Merge branch '2014.7' into develop 2014-08-04 10:43:34 -06:00
Thomas S Hatch
c7e16fbcb2 Merge pull request #14683 from eliasp/2014.7-states.file.managed-check-defaults 
Also validate 'defaults' in states.file.managed
 2014-08-04 10:41:44 -06:00
Thomas S Hatch
fc7e3ff6b7 Merge pull request #14682 from rasathus/develop 
Added support for resilient elasticseach clusters via multiple hosts
 2014-08-04 10:30:46 -06:00
Thomas S Hatch
ff984f2012 Merge pull request #14656 from kyriakosoikonomakos/timedelta 
fix for issue #14655
 2014-08-04 10:25:04 -06:00
Thomas S Hatch
8e06d67d48 Merge pull request #14641 from zigarn/issue/14640 
Fix `win_pkg.list_upgrades`
 2014-08-04 10:21:06 -06:00
Thomas S Hatch
5a2bfeb266 Merge pull request #14627 from hvnsweeting/hvn-fix-rabbitmq-cluster 
fix rabbitmq cluster document & function name
 2014-08-04 10:19:10 -06:00
Thomas S Hatch
0bf71285e7 Merge pull request #14607 from lyft/boto_asg-resolve-error-tags-not-given 
Resolve - https://github.com/saltstack/salt/issues/14604
 2014-08-04 10:17:51 -06:00
Thomas S Hatch
77d709a29c Merge pull request #14601 from lyft/provide-vpc-exists-support 
Provide vpc exists support
 2014-08-04 10:16:38 -06:00
Thomas S Hatch
970f1f1ae0 Merge pull request #14539 from makinacorpus/fix2 
file.copy: be smart with file changes
 2014-08-04 10:13:18 -06:00
Thomas S Hatch
1bd88cab28 Merge pull request #14535 from steverweber/template_var 
add two vars to the templates slspath and tplpath
 2014-08-04 10:06:07 -06:00
Seth House
f5d1203542 Added pretty option to state.event for pretty-printing the JSON 2014-08-04 10:37:37 -04:00
Seth House
2bdcd5bb7f Switch state.event runner default to listen forever 
This is the more common use-case. Updated examples accordingly.
 2014-08-04 10:37:37 -04:00
Alejandra Sanchez
9fd7f90270 Adds compact output method. 
Fixs #14470.
 2014-08-04 17:26:21 +10:00
NicholasTD07
86b7bfd5e0 Add newline_values_only and flaten output methods. 
Fixs #9443.
 2014-08-04 16:40:29 +10:00
Daniel Bryan
29393df392 Add force_reset option to git.latest; fixes #10414 2014-08-04 15:30:19 +10:00
Erik Johnson
2e9011468a Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-03 22:31:03 -05:00
Erik Johnson
888e1f7097 Merge pull request #14703 from NicholasTD07/add_make_to_versions 
Added Mako to versions report.
 2014-08-03 22:25:18 -05:00
NicholasTD07
0e110a6ca0 Added Mako to versions report. 
Fixs #10239.
 2014-08-04 12:04:07 +10:00
Seth House
5f624fbda2 Added an example to the state.event runner for non-trivial sh usage 2014-08-03 18:46:33 -06:00
Colin Johnson
8dd88066f7 boto_asg now support use of security group names in launch configs 2014-08-04 00:04:20 +00:00
Joseph Hall
f3e4fe5440 Merge pull request #14700 from gtmanfred/develop 
document the usage of userdata for cloud-init
 2014-08-03 14:53:27 -06:00