valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,215 Commits 24 Branches 182 Tags 341 MiB
f2d855bfbf
Commit Graph

80215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Harring
80ebd77d67 ticket 40348: fix pillar include key nested support 
Extend pillar include support so that nesting is possible
for the key directive.

Given the following pillar files:

foo1.sls:
include:
- foo:
    key: two:levels

foo2.sls:
foon: blah

After this commit, it'll result in the following pillar data:

two:
  levels:
    foon: blah

Currently, it results in the following data which is far less useful
for usage, and in ability to be addressed:

two:levels:
  foon: blah
 2017-03-27 17:19:24 -07:00
Mike Place
1381f97292 Merge pull request #40264 from meaksh/2016.3-gather_job_timeout-fix 
Makes sure "gather_job_timeout" is an Integer
 2017-03-27 17:52:50 -06:00
Mike Place
e15e65dc9f Merge pull request #40276 from skizunov/develop2 
rabbitmq: Do not use `__context__` for persistent globals
 2017-03-27 17:37:26 -06:00
Mike Place
bb9c1c2775 Merge pull request #40291 from cloudflare/fix-39775 
Trying to fix #39775 (Proxy `mine_interval` config ignored)
 2017-03-27 17:28:23 -06:00
rallytime
e77e86db3a Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-27 17:27:49 -06:00
Mike Place
3ee5894b9c Merge pull request #40292 from tgoodlet/qcow_docs 
Document qcow support
 2017-03-27 17:27:14 -06:00
Mike Place
338148de2c Cleaned up language slightly 2017-03-27 17:26:58 -06:00
Mike Place
15808b083f Tiny grammar fix 2017-03-27 17:25:31 -06:00
Mike Place
da4472cbe4 Merge pull request #40323 from jdsieci/selinux 
Added support for install and removal SELinux modules
 2017-03-27 17:22:54 -06:00
Daniel Wallace
5596620dfb fix some test=True comments 
Alternatives should say it is setting the symlink to `path` instead of
`current` which it is already set to

ssh_auth.absent should say it is going to remove the key, unless the status is
set to `add`, then it is already absent

Fixes #40322
Fixes #40321
 2017-03-27 18:19:52 -05:00
Mike Place
a572b46183 Merge pull request #40346 from saltstack/revert-40332-pip-cache-fixes 
Revert "Fixes related to cache directory argument changes in pip>=6."
 2017-03-27 17:17:28 -06:00
Mike Place
b4753d1a5a Revert "Fixes related to cache directory argument changes in pip>=6." 2017-03-27 17:17:18 -06:00
Mike Place
a91bab867e Merge pull request #40326 from L4rS6/update-mount-state-doc 
Update mount state documentation (Fixes: #40296)
 2017-03-27 17:15:52 -06:00
Mike Place
ca2980cfb0 Merge pull request #40328 from L4rS6/fix-mount-state-extra-ignore-fs-key 
Fixes wrong compared extra_mount_ignore_fs_keys key.
 2017-03-27 17:14:22 -06:00
Mike Place
3a6c5d0297 Merge pull request #40329 from isbm/isbm-merge-tops-201611 
Merge tops (backport)
 2017-03-27 17:13:46 -06:00
Mike Place
02cc480a2a Merge pull request #40330 from techhat/mapdata 
Pass in direct map_data instead of path to map
 2017-03-27 17:12:49 -06:00
Mike Place
40af798b29 Merge pull request #40334 from techhat/cacheinternal 
Allow filename to be part of a cache bank
 2017-03-27 17:08:27 -06:00
Mike Place
3a63712a65 Merge pull request #40336 from techhat/sdbcache 
Add SDB driver for salt cache
 2017-03-27 17:07:32 -06:00
Mike Place
17ab1da0ab Merge pull request #40345 from twangboy/fix_osx_build 
Fix osx build
 2017-03-27 17:05:29 -06:00
Mike Place
2b7b2f1cb4 Merge pull request #40285 from rallytime/docker-test-fixes 
Dockerng unit tests fixes: isolate global variables
 2017-03-27 17:05:02 -06:00
Nicole Thomas
7ab10491ab Merge pull request #40338 from UtahDave/fix_cherrypy_ssl_error_link 
Upstream cherrypy moved to Github from Bitbucket
 2017-03-27 16:00:38 -06:00
Mike Place
01efc842c1 Merge pull request #40341 from twangboy/fix_win_service 
Fix service.create, fix docs
 2017-03-27 15:46:18 -06:00
Mike Place
1a8c286279 Merge pull request #40331 from techhat/runnercache 
Add more functions to cache runner
 2017-03-27 15:02:08 -06:00
Mike Place
8eabcca6dc Merge pull request #40332 from zer0def/pip-cache-fixes 
Fixes related to cache directory argument changes in pip>=6.
 2017-03-27 15:01:15 -06:00
Mike Place
ceba1b9bc6 Merge pull request #40337 from Ch3LL/add_unzip_test 
Add archive.extracted with use_cmd_unzip argument
 2017-03-27 15:00:22 -06:00
Mike Place
a192597ec2 Merge pull request #40312 from rallytime/cache-docs 
Update minion data cache documentation
 2017-03-27 14:56:55 -06:00
twangboy
3207d670c5 Fix osx build 2017-03-27 14:52:19 -06:00
Mike Place
2d255042b7 Merge pull request #40340 from techhat/venaficheck 
Fix check for empty minions bank (venafi)
 2017-03-27 14:41:55 -06:00
Mike Place
c218f8c233 Merge pull request #40343 from Ch3LL/require_ins_sls_test 
Add a test for full sls require_in
 2017-03-27 14:41:03 -06:00
Nicole Thomas
e2553bb8b1 Merge pull request #40342 from vquiering/logstash_engine_udp 
Set logstash engine default to udp
 2017-03-27 14:04:21 -06:00
Ch3LL
4c0ca2a987 remove unnecessary sls file 2017-03-27 12:59:52 -06:00
Ch3LL
aae2a30eda add require_in for an entire sls test 2017-03-27 12:47:36 -06:00
Vitali Quiering
c9f2af226c set logstash engine defaults to udp 2017-03-27 20:11:07 +02:00
twangboy
6736457ec8 Docs for create 2017-03-27 11:49:19 -06:00
twangboy
652cf08f8a Fix service.create, fix docs 2017-03-27 11:44:18 -06:00
rallytime
0f263a52e0 Mock out the get_client_args mocks in the dockerng module tests more aggressively 
The tests pass fine when run independently, but when the full unit test suite
runs, the dockerng state tests are setting global values. This change makes the
module tests avoid those problem by relying on its own mocks.
 2017-03-27 11:27:52 -06:00
Joseph Hall
6fd51b2f00 Fix check for empty minions bank (venafi) 2017-03-27 11:25:10 -06:00
David Boucha
280b501950 Upstream cherrypy moved to Github from Bitbucket 2017-03-27 10:45:34 -06:00
Joseph Hall
0a036014e2 Remove log statements 2017-03-27 10:35:32 -06:00
Joseph Hall
8b14ebe799 Add SDB driver for salt cache 2017-03-27 10:32:57 -06:00
Ch3LL
8b21b4c8bb add use_cmd_unzip test 2017-03-27 10:32:27 -06:00
Joseph Hall
70ee0d95c5 Allow filename to be part of a cache bank 2017-03-27 10:17:11 -06:00
Joseph Hall
1e22aa2f00 Fix kwargs 2017-03-27 09:26:08 -06:00
Nicole Thomas
7f16754619 Merge pull request #40315 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-27 09:11:24 -06:00
Nicole Thomas
a9a73bf8dc Merge pull request #40313 from techhat/calcref 
Add minimum and maximum to calls to calc
 2017-03-27 08:54:14 -06:00
Nicole Thomas
284d3be943 Merge pull request #40304 from vquiering/logstash_engine_add_protocol 
Add ip protocol to logstash engine
 2017-03-27 08:51:29 -06:00
Nicole Thomas
74cc74d784 Merge pull request #40246 from tonybaloney/fix_libcloud_dns_bug 
Fix libcloud_dns state module bug
 2017-03-27 08:49:13 -06:00
Joseph Hall
3c69689fe2 Add more functions to cache runner 2017-03-27 08:44:25 -06:00
zer0def
7976840100 Fixes related to cache directory changes in pip>=6. 2017-03-27 16:29:41 +02:00
Joseph Hall
5940679658 Fix function name 2017-03-27 08:25:38 -06:00