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
25,931 Commits 24 Branches 182 Tags 341 MiB
1d0ce14f4a
Commit Graph

25931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
7989d7da8c Merge pull request #10314 from muffl0n/develop 
Remove first three lines if starting with "DO NOT EDIT THIS FILE"
 2014-02-10 12:20:47 -07:00
Thomas S Hatch
24acb29712 Merge pull request #10263 from tweakster/develop 
Allow lxc module to work on both Ubuntu and Redhat
 2014-02-10 12:17:57 -07:00
Thomas S Hatch
646f433c6b Merge pull request #10311 from terminalmage/gitfs-dulwich 
Add dulwich support to gitfs backend
 2014-02-10 12:10:53 -07:00
Thomas S Hatch
3b045d7719 Merge pull request #10319 from plastikos/issue-10318 
Do not fail if the system does not support IPv6
 2014-02-10 12:10:20 -07:00
Thomas S Hatch
010d4231f8 Merge pull request #10313 from s0undt3ch/hotfix/minion-hang-on-join 
Stop the Jenkins aborted buidls
 2014-02-10 12:09:38 -07:00
Thayne Harbaugh
08ed0f0e1e Do not fail if the system does not support IPv6 
Fixes: #10318
 2014-02-10 11:01:34 -07:00
Colton Myers
d266d46699 Merge pull request #10316 from techhat/gce 
Removing ex_persistent_disk from GCE, as it was only briefly supported...
 2014-02-10 10:18:54 -07:00
Joseph Hall
50e388556c Removing ex_persistent_disk from GCE, as it was only briefly supported by libcloud 2014-02-10 10:15:39 -07:00
Erik Johnson
365338f02c Fix incorrectly-named variable 2014-02-10 11:06:24 -06:00
Thomas S Hatch
ee61a2948e Merge pull request #10315 from drj11/patch-1 
Update file.py
 2014-02-10 09:39:25 -07:00
Thomas S Hatch
9276d469ae Merge pull request #10308 from gtmanfred/develop 
[salt] add cp.push_dir
 2014-02-10 09:33:11 -07:00
Erik Johnson
7e8d5a85c6 Add notes about dulwich support to docstring 2014-02-10 10:32:54 -06:00
Erik Johnson
a047396914 Add dulwich support to gitfs backend 2014-02-10 10:32:33 -06:00
Thomas S Hatch
466f779479 Merge pull request #10305 from halfss/patch-2 
exactly match minion in list
 2014-02-10 09:30:53 -07:00
Thomas S Hatch
00f231e7d8 Merge pull request #10298 from jacksontj/channelreuse 
Reuse channels
 2014-02-10 09:27:07 -07:00
Thomas S Hatch
22184e975b Merge pull request #10297 from jacksontj/develop 
Reading through found typo and a redundant opts set
 2014-02-10 09:26:03 -07:00
Thomas S Hatch
1f9144ff5e Merge pull request #10294 from terminalmage/quickfix 
Prefer GitPython if gitfs_provider not specified
 2014-02-10 09:25:23 -07:00
Thomas S Hatch
aca44abf40 Merge pull request #10289 from terminalmage/hgfs-rewrite 
Make hgfs awesome
 2014-02-10 09:24:53 -07:00
muffl0n
4f9ee66b49 Corrected errors reported by Jenkins 2014-02-10 17:23:40 +01:00
Thomas S Hatch
cfc825380e Merge pull request #10276 from UtahDave/fix_msgpack 
read and write binary when serializing with msgpack
 2014-02-10 09:20:55 -07:00
David Jones
ca6a9259c5 Update file.py 
"target" is an unfortunate choice of word here.
 2014-02-10 16:04:24 +00:00
Pedro Algarvio
362e162496 Remove un-necessary code 2014-02-10 15:10:19 +00:00
muffl0n
3e231304a5 Remove first three lines if starting with "DO NOT EDIT THIS FILE" 
Patch for #10312
 2014-02-10 15:35:14 +01:00
Pedro Algarvio
ec5614bd08 Remove the vim jedi output from the code 2014-02-10 13:28:28 +00:00
Pedro Algarvio
3cffd0e2b8 Remove extra empty line 2014-02-10 13:14:24 +00:00
Pedro Algarvio
74dae3b842 And, as a last resort, kill the process after failing to terminate them. 2014-02-10 13:11:09 +00:00
Pedro Algarvio
7c60ca4189 Use proper variable names 2014-02-10 12:43:04 +00:00
Pedro Algarvio
f222d896dc Typo 2014-02-10 12:42:18 +00:00
Pedro Algarvio
abe5a5e464 Stop Minion processing once signaled. 
This is, apparently, the problem with the aborted Jenkins builds.
The `runtests.py` script runs the minion in a `multiprocess` and tries
to `join()` it after `terminate()` is called.
This problem does not show up on every execution and, so far, I wasn't
able to narrow down the culprit code because of the weak reproducibility, but this, however, seems to stop the problem from reappearing.
 2014-02-10 12:18:36 +00:00
Pedro Algarvio
1de2a62733 Merge pull request #10303 from s0undt3ch/develop 
Minor formatting
 2014-02-10 11:10:39 +00:00
Joseph Hall
92f8884980 Merge pull request #10310 from rgbkrk/patch-4 
s/law/lay
 2014-02-09 21:13:59 -07:00
Kyle Kelley
7d69e42de1 s/law/lay 2014-02-09 21:12:44 -07:00
Daniel Wallace
5d16196cb7 [salt] add cp.push_dir 
I want to be able to push full directories to the master recursively.
 2014-02-09 17:12:12 -06:00
Mathieu Le Marec - Pasquet
d454dcc9da Be sure not to loose any var in case of multi macro inheritance 2014-02-09 22:00:34 +01:00
halfss
902236e8a8 exactly match minion in list 
My nodegroup:
<pre>
nodegroups:
  bug: L@192.168.1.172,192.168.1.173
</pre>


run cmd with the "bug" group, and i have a minion with name "192.168.1.17", will like this:
<pre>
[root@salt-master salt]# salt -N bug cmd.run 'uptime' -v
Executing job with jid 20140209210600669692
-------------------------------------------
192.168.1.172:
     21:06:01 up 87 days,  5:55,  0 users,  load average: 0.00, 0.00, 0.00
192.168.1.173:
     21:06:01 up 120 days,  4:59,  0 users,  load average: 0.03, 0.03, 0.00
192.168.1.17:  (should not be here)
    Minion did not return
</pre>
 2014-02-09 23:09:47 +08:00
Pedro Algarvio
41b9b1a8d9 No need to escape quotes 2014-02-09 06:44:16 +00:00
Pedro Algarvio
7f62d5f418 Merge pull request #10302 from gtmanfred/develop 
[salt] need the extra space
 2014-02-09 05:48:13 +00:00
Daniel Wallace
cda8ea170b [salt] need the extra space 
Otherwise the first package gets concatinated with the --needed
 2014-02-08 23:17:26 -06:00
Joseph Hall
f526267d2b Merge pull request #10301 from gtmanfred/develop 
[salt.cloud] missing a : in documentation
 2014-02-08 21:03:02 -07:00
Daniel Wallace
7042099c14 [salt.cloud] missing a : in documentation 2014-02-08 22:05:14 -06:00
Pedro Algarvio
7560ab3984 Double to single quotes and enforce .format() 2014-02-09 02:36:25 +00:00
Samuel M Smith
5ca67e7ec4 start ot add test 2014-02-08 19:05:53 -07:00
Samuel M Smith
e961df49c3 Merge remote-tracking branch 'upstream/develop' into sam_2014_02_03 2014-02-08 19:02:49 -07:00
Samuel M Smith
dc91f4bdf9 Added new nacl interface library 
added some tests
 2014-02-08 19:01:58 -07:00
Samuel M Smith
8890668d11 More refactoring and filling out 2014-02-08 19:00:54 -07:00
Pedro Algarvio
767893956d Merge pull request #10295 from terminalmage/docs 
Add warning re: gitfs cache in pre-Hydrogen releases
 2014-02-09 00:36:11 +00:00
Pedro Algarvio
5233853558 Merge pull request #10299 from s0undt3ch/develop 
Minor output cosmtic changes
 2014-02-09 00:35:18 +00:00
Pedro Algarvio
8561be1fee For output consistency. 2014-02-09 00:21:18 +00:00
Thomas Jackson
22df6a69b3 Update comment 2014-02-08 15:37:39 -08:00
Thomas Jackson
2c0a878a06 Reuse channels 
store a cache of the channels so a single pid can re-use a connection
this needs to be per pid as when you fork you keep the original memory
space and we can't control currency across pids
 2014-02-08 15:36:38 -08:00