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
83,177 Commits 24 Branches 182 Tags 341 MiB
fee59e8159
Commit Graph

83177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neile Havens
fee59e8159 Merge branch 'develop' into develop 2017-06-22 07:13:12 -05:00
Mike Place
31d51e7093 Merge pull request #41871 from cloudflare/thorium-work 
Various additions for Thorium
 2017-06-21 12:26:29 -05:00
Mike Place
8df2888f61 Remove unused import 2017-06-21 11:26:18 -06:00
Mike Place
8114d3da03 Merge pull request #41525 from rocket-labs-sysadmins/feature-36456 
Add more functions to boto_elbv2 module
 2017-06-21 12:14:58 -05:00
garethgreenaway
5ae8983ad5 Merge branch 'develop' into thorium-work 2017-06-21 09:40:23 -07:00
Mike Place
e9bb2b6fdc Merge pull request #41866 from whiteinge/rest_cherrypy-ssl-version-range 
rest_cherrypy SSL version range update
 2017-06-21 10:31:11 -05:00
garethgreenaway
b43d01808b Merge branch 'develop' into thorium-work 2017-06-21 08:26:26 -07:00
garethgreenaway
30025a281e Merge branch 'develop' into develop 2017-06-21 08:20:01 -07:00
garethgreenaway
7bb81df919 Merge pull request #41873 from ashishdisawal/develop 
Updated documentation of iptables module
 2017-06-21 08:18:28 -07:00
Ashish Disawal
4a0cfe9787 Merge branch 'develop' into develop 2017-06-21 18:03:16 +05:30
Ashish Disawal
c092eb0506 Updated documentation of iptables module 
The documentation said use '--state' in build_rule, but 'state' kwarg is being ignored at line 246.
In bash, the --source '! 127.0.0.1' did not work, but --source '!127.0.0.1' did.
 2017-06-21 17:50:12 +05:30
Mircea Ulinic
3e2e6196b9 Add count_* kwargs for the contains function 2017-06-21 11:21:33 +00:00
Mircea Ulinic
9e681943c2 Reverting to redundant code, as __reg__ is not available 2017-06-21 11:21:28 +00:00
Mircea Ulinic
35e06545c4 Add register length check functions 2017-06-21 11:21:24 +00:00
Mircea Ulinic
d1e300c438 Avoid redundant code 2017-06-21 11:21:19 +00:00
Mike Place
11bdbafefb Merge pull request #41709 from terminalmage/issue37322 
Do not merge master_tops and top file matches using set union
 2017-06-20 19:05:12 -05:00
Neile Havens
46d4c8b985 Merge branch 'develop' into develop 2017-06-20 18:06:02 -05:00
Seth House
e33b632abd Remove old versionaddedd 2017-06-20 16:35:30 -06:00
Seth House
ada4d54fa1 Update rest_cherrypy SSL version warning 2017-06-20 16:35:13 -06:00
Erik Johnson
63823f3436 Do not merge master_tops and top file matches using set union 
The code which integrates master_tops SLS matches with top file SLS
matches was using set operations to ensure there were no duplicate
matches. However, the process of first converting the matches to a set,
and then performing a union on the two sets, has the side effect of
making the ordering unpredictable.

The set operations have been removed in favor of list comprehensions.
This ensures that the ordering is predictable, and that master_tops
matches are executed *after* top file matches.

In addition, a new minion config option called "master_tops_first" has
been added to allow for the master_tops matches to be executed *before*
top file matches.
 2017-06-20 15:04:34 -05:00
Mike Place
ecb5f26299 Merge pull request #41793 from abednarik/41732_cmd_run_docs_fix 
Fix typo in cmd.wait documentation
 2017-06-20 14:53:58 -05:00
Mike Place
d3f1e668a2 Merge pull request #41782 from terminalmage/pr-35533 
Re-open #35533 to resolve merge conflicts
 2017-06-20 14:52:34 -05:00
Mike Place
724602b366 Merge pull request #41802 from farcaller/grains-cache-writer 
Remove grains cache file in case if serialization failed for whatever reason
 2017-06-20 14:47:18 -05:00
Mike Place
b23628b742 Merge pull request #41822 from BenjaminSchubert/develop 
documentation fix in module modules.test
 2017-06-20 14:43:43 -05:00
Neile Havens
89d804b7c3 Merge branch 'develop' into develop 2017-06-20 13:16:53 -05:00
Mike Place
0057eba7f0 Merge pull request #41844 from bodhi-space/infra4686 
INFRA-4686 - fix return status pass-through for sub-functions in boto_elb.present()
 2017-06-20 09:32:01 -05:00
Mike Place
c6cd7eba2a Merge pull request #41780 from ferringb/fix-template-loading 
Fix salt.util.render_jinja_tmpl usage for when not used in an environmnet
 2017-06-20 09:29:50 -05:00
Benjamin Schubert
85ee506445
Register try as an alias for try_ 2017-06-20 14:15:40 +02:00
Neile Havens
f9455e9d81 Merge branch 'develop' into develop 2017-06-20 06:59:05 -05:00
garethgreenaway
c1245acaad Merge branch 'develop' into pr-35533 2017-06-19 18:47:29 -07:00
garethgreenaway
b46964725c Merge pull request #41843 from rallytime/bump-stale-config 
Reduce the number of days an issue is stale by 25
 2017-06-19 18:45:52 -07:00
Tom Williams
26f3fbba41 INFRA-4686 - fix return status pass-through for sub-functions in boto_elb.present() 2017-06-19 20:31:19 -04:00
rallytime
42989d5a28 Reduce the number of days an issue is stale by 25 
This reduces the amount of time an issue is stale to approximately
3 years, 3 months, and some change.
 2017-06-19 17:29:44 -06:00
Mike Place
7b75e5cb6e Merge pull request #41840 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-06-19 18:00:48 -05:00
Erik Johnson
52f2b8c33f Handle cases where dest is None 2017-06-19 16:24:30 -05:00
abednarik
37cfcbebd5 Fix typo in cmd.wait documentation 2017-06-19 17:31:14 -03:00
rallytime
add5b118a3 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
 2017-06-19 14:12:36 -06:00
Mike Place
56e1d3bc10 Merge pull request #41827 from alexbleotu/jinja_tests-gh 
JINJA tests
 2017-06-19 14:59:46 -05:00
Nicole Thomas
c84a6f36f4 Merge pull request #41808 from gtmanfred/py3 
Fix last of the failing mac/py3 tests
 2017-06-19 13:57:32 -06:00
Mike Place
389a689be9 Merge pull request #41604 from plassa-b/develop 
Allow the user to get multiple service statuses at once through globbing
 2017-06-19 12:35:59 -05:00
Mike Place
89e88738b2 Merge pull request #41647 from cetanu/patch-3 
cloud vmware get_instance [size] #38814
 2017-06-19 12:06:50 -05:00
Mike Place
3cdd2fe96c Merge pull request #41701 from twangboy/remove_win_unicode_console 
Remove win_unicode_console dependency
 2017-06-19 11:57:12 -05:00
Mike Place
ffb8149de4 Merge pull request #41777 from garethgreenaway/41742_adding_force_option 
Additions to lvm module and state module
 2017-06-19 11:56:44 -05:00
Mike Place
5bc7a20327 Missing colon 2017-06-19 10:52:45 -06:00
Mike Place
6ffe501e17 Merge pull request #41825 from alexbleotu/proxy_fixes-gh 
Injected the __proxy__ dunder in remaining state execution functions
 2017-06-19 11:31:31 -05:00
Mike Place
edf67319e4 Merge pull request #41730 from gtmanfred/nitrogen 
open and write in byte mode using fileserver
 2017-06-19 11:28:26 -05:00
Mike Place
a3efd53371 Merge pull request #41784 from gtmanfred/2017.7 
use our own mock_open
 2017-06-19 11:25:07 -05:00
Mike Place
9ccfcfffe6 Merge pull request #41796 from farcaller/grains-cache 
Refactored grains cache loader.
 2017-06-19 11:24:10 -05:00
Alexandru Bleotu
e42d1172a8 Added Tests section in JINJA documentation 2017-06-19 17:15:23 +01:00
Mike Place
2bbfa99e57 Merge pull request #41792 from loverend/napalm_logs_engine_auth 
Update napalm_syslog engine to use auth class
 2017-06-19 10:53:27 -05:00