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,571 Commits 24 Branches 182 Tags 341 MiB
b4cb1bdd20
Commit Graph

38571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erik Johnson
89d1018b64 Add PID to default logfile format string 
Resolves #11346.
 2014-10-21 17:05:18 -05: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
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
Thomas S Hatch
dc68835866 Merge pull request #16743 from s0undt3ch/hotfix/repetitive-random-ssh-remote-dir 
Improve default randomness of thin directory
 2014-10-19 19:56:55 -06:00
Thomas S Hatch
f49282b0e8 Merge pull request #16747 from s0undt3ch/hotfix/add-last-EOF-to-shim 
Add last `EOF` to shim deployment code
 2014-10-19 19:50:01 -06:00
Thomas S Hatch
ac9089e6f1 Merge pull request #16746 from s0undt3ch/develop 
Merge branch '2014.7' forward into develop
 2014-10-19 19:48:32 -06:00
Pedro Algarvio
45604d7f77 Merge pull request #16749 from terminalmage/gitfs-docs 
Add further clarification that gitfs auth is pygit2-only
 2014-10-19 23:03:43 +01:00
Erik Johnson
13a92bde69 Add further clarification that gitfs auth is pygit2-only 2014-10-19 17:01:13 -05:00
Dennis Jacobfeuerborn
d42569d766 Add varstack ext_pillar 2014-10-19 23:50:46 +02:00
Pedro Algarvio
f2c23ab4fe Use salt.utils.fopen() 2014-10-19 20:16:18 +01:00
Pedro Algarvio
edf7da8729 Fix bad merge conflict fix 2014-10-19 20:10:12 +01:00
Pedro Algarvio
c05f42e54a Add last EOF to shim deployment code 2014-10-19 19:21:10 +01:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
Seth House
6486772151 Merge pull request #16670 from felskrone/extend_wheel_key 
Extend wheel.key with match_dicts
 2014-10-19 09:19:45 -06:00
Thomas S Hatch
3f239422e5 Merge pull request #16742 from terminalmage/fix-broken-gitfs 
Fix bad auth param handling in gitfs
 2014-10-18 20:01:15 -06:00
Pedro Algarvio
3654294512 Improve default randomness of thin directory 
This will reduce the usage of ``--rand-thin-dir` since the FQDN of the
machine is also included in the remote temporary directory name.
 2014-10-18 23:53:40 +01:00
Erik Johnson
90ba9b8a43 Add notice that per-remote auth params are not supported in GitPython 2014-10-18 17:36:51 -05:00
Erik Johnson
9c9884f800 Be more explicit about auth only being supported in pygit2 
Also, don't let Salt use a badly-configured remote.
 2014-10-18 17:13:58 -05:00
Erik Johnson
f9d9e1ab8c Revert "gitfs: accept per-remote auth params (fixes #16698)" 
This reverts commit 751b582b45.
 2014-10-18 16:40:03 -05:00
Pedro Algarvio
ab40ca804f Merge pull request #16736 from thatch45/cp_ssh 
Add cp module to ssh
 2014-10-18 21:00:15 +01:00
Pedro Algarvio
9db814db2f Merge pull request #16737 from thatch45/notes_2014.7 
Add salt-ssh to release notes
 2014-10-18 20:59:22 +01:00
Thomas S Hatch
809a277fdb lint 2014-10-18 09:29:19 -06:00
Thomas S Hatch
2e9b63ed31 Add notes on cp module and -W/w 2014-10-18 09:24:31 -06:00
Thomas S Hatch
6257538236 Merge branch '2014.7' into notes_2014.7 2014-10-18 08:52:50 -06:00