valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,592 Commits 24 Branches 182 Tags 341 MiB
e4085fd040
Commit Graph

38592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e4085fd040 Merge pull request #16816 from holmboe/assigned-codenames 
Document assigned codenames
 2014-10-22 09:24:08 -06:00
Henrik Holmboe
5d7184491f Document assigned codenames 2014-10-22 17:20:40 +02:00
Joseph Hall
eb1b68b9e3 Merge pull request #16811 from holmboe/patch-3 
Point to the correct latest release
 2014-10-22 08:10:10 -06:00
Henrik Holmboe
d4258e9040 Point to the correct latest release 
This is recurring and #12720 is tracking the issue.
 2014-10-22 15:56:00 +02:00
Nicole Thomas
9c4539da45 Merge pull request #16801 from rallytime/merge_forward 
Merge forward
 2014-10-21 19:26:42 -06:00
Joseph Hall
f286964653 Merge pull request #16792 from garethgreenaway/hipchat_returner 
Hipchat Returner
 2014-10-21 19:21:59 -06:00
Joseph Hall
22e8a431be Merge pull request #16807 from gtmanfred/develop 
pyrax - only delete queue if show returns an queue object
 2014-10-21 18:18:12 -06:00
Daniel Wallace
9d042b0b6d pyrax - only delete queue if show returns an queue object 2014-10-21 18:16:22 -05:00
rallytime
84e94710e8 delim --> delimeter 2014-10-21 16:59:49 -06:00
Thomas S Hatch
b4cb1bdd20 Merge pull request #16800 from terminalmage/issue11346 
Add PID to default logfile format string
 2014-10-21 16:55:07 -06:00
Thomas S Hatch
2ff72ab9ba Merge pull request #16798 from cachedout/issue_15143 
Avoid key error in connected_ids()
 2014-10-21 16:48:13 -06:00
Thomas S Hatch
70b1685437 Merge pull request #16748 from conversis/varstack-ext-pillar 
Add varstack ext_pillar
 2014-10-21 16:43:37 -06:00
Thomas S Hatch
e00168c4ae Merge pull request #16767 from plastikos/develop 
Add a "base" dictionary argument to grains:filter_by()
 2014-10-21 16:42:49 -06:00
rallytime
df827ab13c Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/minions.py
 2014-10-21 16:07:33 -06:00
Erik Johnson
89d1018b64 Add PID to default logfile format string 
Resolves #11346.
 2014-10-21 17:05:18 -05:00
Nicole Thomas
ff1646e451 Merge pull request #16769 from rallytime/jid_str_test 
Test long jid passed on CLI
 2014-10-21 15:50:29 -06:00
Nicole Thomas
598a35f973 Merge pull request #16796 from rallytime/bp-16704 
Backport #16704 to 2014.7
 2014-10-21 15:50:12 -06:00
Mike Place
0ec209dd85 Avoid key error in connected_ids() 
Continue through the loop if we could't access the grains instead of
crashing and burning.

Closes #15143
 2014-10-21 15:41:39 -06:00
Cimarron Mittelsteadt
43fea4f3ea TST: Updated mac_user tests for modifications to OS release handling 2014-10-21 15:00:58 -06:00
Cimarron Mittelsteadt
0fa54ed42b BUG: fixes a bug where the check for versions numbers fails to work for versions a.b where b>=10 2014-10-21 15:00:58 -06:00
Thomas S Hatch
3a31ac4aa4 Merge pull request #16791 from cachedout/issue_16782 
Be safe about removing minion ids
 2014-10-21 14:10:55 -06:00
Thomas S Hatch
e17b3ce194 Merge pull request #16789 from cachedout/issue_16783 
Send correct tgt_type
 2014-10-21 14:10:29 -06:00
Gareth J. Greenaway
b675b5e372 based on the excellent work by Anita Krueger <anita@steponeinc.com>, initially adding a returner for hipchat. 2014-10-21 12:24:29 -07:00
Mike Place
c7e8e59fc6 Be safe about removing minion ids 
Closes #16782
 2014-10-21 13:17:06 -06:00
Mike Place
af3b22f93c Send correct tgt_type 
Fixes #16783
 2014-10-21 13:07:44 -06:00
rallytime
ed37dde094 Pylint fix 2014-10-20 21:21:01 -06:00
rallytime
3020b2084b Test long jid passed on CLI 2014-10-20 16:53:56 -06:00
Thayne Harbaugh
ec204fe3d7 Add a "base" dictionary argument to grains:filter_by() 
The base argument provides a base dictionary for default settings.
The grain-selected look_up dictionary is then merged over the top of
base followed by the merge dictionary being merged.  The base allows
for common settings in each of the look_up groups to be collected into
the base so that they do not have to be repeated for each group.

example1:

  salt '*' grains.filter_by '{A: {B: Z}, C: {D: {E: F,G: H}}}' 'xxx' '{D: {E: I},J: K}' 'C' '{D: {E: X}, L: M}'

result1:

  {D: {E: I, G: H}, J: K, L: M}

example2:

  The same as example1 but with default selector 'A' rather than 'C'.

result2:

  {B: Z, D: {E: I}, J: K, L: M}
 2014-10-20 16:20:28 -06:00
Thomas S Hatch
cf14ef20d5 Merge branch '2014.7' into develop 2014-10-20 16:06:53 -06:00
Thomas S Hatch
a1d27b9cc5 Merge pull request #16764 from thatch45/16762 
Don't allow args to be longs, msgpack does not like this and jids
 2014-10-20 16:03:53 -06:00
Thomas S Hatch
9992edfdca Merge branch '2014.7' into develop 
Conflicts:
	salt/loader.py
 2014-10-20 15:52:31 -06:00
Thomas S Hatch
abd7910414 Merge pull request #16761 from ekristen/fix-issue-#16710 
Ensure new status messages for docker layers are handled. Fix by @krak3n
 2014-10-20 15:48:23 -06:00
Thomas S Hatch
8ad8fa9687 Don't allow args to be longs, msgpack does not like this and jids 
should always be strings
 2014-10-20 15:03:58 -06:00
Joseph Hall
94cb2f4161 Merge pull request #16763 from martynsmith/patch-1 
Fix example command to one that exists
 2014-10-20 14:55:17 -06:00
Martyn Smith
a899af7418 Fix example command to one that exists 
Fix walkthrough to use disk.usage instead of disk.percent (which doesn't appear to exist any more).
 2014-10-21 09:51:54 +13:00
Thomas S Hatch
45b88acd2d Merge pull request #16759 from thatch45/fix_salt_val 
Fix #16504
 2014-10-20 14:41:59 -06:00
Joseph Hall
17dbfd4a58 Merge pull request #16760 from terminalmage/docs 
Improvements to releases page
 2014-10-20 14:04:14 -06:00
Erik Kristensen
5319e4a76c @krak3n fix, ensure new docker states for layers are handled properly 2014-10-20 13:24:09 -06:00
Erik Johnson
af25ad1019 Improvements to releases page 
This clarifies what the current stable release is. It also hides the
2014.7.0 release notes until we actually release that version.
 2014-10-20 14:11:51 -05:00
Dennis Jacobfeuerborn
b05e38bb8c Fix pylint complaints 2014-10-20 20:48:00 +02:00
Thomas S Hatch
8d29625076 Fix #16504 
This is a deep fix, we need to test it thoroghly
 2014-10-20 12:41:57 -06:00
Mike Place
2d31941749 Merge pull request #16758 from rallytime/docs_fix 
Fix small typo in fedora installation docs
 2014-10-20 12:10:05 -06:00
rallytime
559ed2906b Fix small typo in fedora installation docs 2014-10-20 12:06:46 -06:00
Joseph Hall
cf8420e671 Merge pull request #16757 from hulu/dir-shadowing 
fileserver.s3fs: avoid shadowing dir() built-in
 2014-10-20 11:36:30 -06:00
Nicole Thomas
98cad59004 Merge pull request #16750 from colinbjohnson/boto_vpc_doc_updates 
boto_vpc documentation updates
 2014-10-20 11:34:21 -06:00
Chris Rebert
20de52366c fileserver.s3fs: avoid shadowing dir() built-in 2014-10-20 10:09:53 -07:00
Thomas S Hatch
3cf0cfb61d Merge branch '2014.7' into develop 2014-10-20 09:20:37 -06:00
Mike Place
038d26491d Merge pull request #16754 from UtahDave/develop 
remove experimental designation
 2014-10-20 08:13:01 -06:00
David Boucha
aabc23924a remove experimental designation 2014-10-20 08:11:54 -06:00
Colin Johnson
760b189d0c boto_vpc documentation updates 2014-10-20 05:41:44 +00:00