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
Mike Place
8919936244 Merge pull request #41809 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-06-19 10:44:57 -05:00
Mike Place
7d5b3fbe4f Merge pull request #41826 from cloudflare/jinja-ref 
Adding Jinja documenation cross reference
 2017-06-19 10:39:11 -05:00
Mike Place
445f603568 Fix incorrect indentation 2017-06-19 09:37:00 -06:00
Alexandru Bleotu
dba43cba00 Renamed equal test to equalto and fixed the comments 2017-06-19 15:48:45 +01:00
Neile Havens
0ca7539e21 Merge branch 'develop' into develop 2017-06-19 07:13:36 -05:00
Alexandru Bleotu
bca81c98a6 Added match, equal jinja tests 
- can be used with the selectattr filter
 2017-06-19 11:46:42 +01:00
Alexandru Bleotu
ce2dc9af12 Added decorator and registered additional JINJA tests 2017-06-19 11:46:42 +01:00
Alexandru Bleotu
2a4835961c Injected the __proxy__ dunder in remaining state execution functions 2017-06-19 10:55:03 +01:00
Mircea Ulinic
fae959d24b Remove duplicate mattermost ref 2017-06-19 09:52:54 +00:00
Mircea Ulinic
d8dc8a338b Add redis cache reference 2017-06-19 09:52:33 +00:00
Mircea Ulinic
fd28d3385c Adding Jinja cross ref 2017-06-19 09:49:45 +00:00
garethgreenaway
0973a6899e Merge pull request #41789 from ashishdisawal/develop 
Fix for #41762
 2017-06-18 21:12:05 -07:00
Ashish Disawal
53c9764339 Merge branch 'develop' into develop 2017-06-18 23:48:53 +05:30
Ashish Disawal
2b9554303a Checking if 'full' is True 
Changes for the iptables unit tests.
 2017-06-18 23:48:08 +05:30
Neile Havens
4491722a80 Fix yum repo file comments to work as documented in pkgrepo.managed 2017-06-17 15:30:48 -05:00
garethgreenaway
4c8aa25080 Merge pull request #41813 from rallytime/add_new_doc_modules 
Add new documentation file references to build system for 2017.7
 2017-06-16 18:54:15 -07:00
Nicole Thomas
4dedf01956 Merge pull request #41811 from rallytime/bp-41806 
Back-port #41806 to 2017.7
 2017-06-16 16:48:39 -06:00
Nicole Thomas
c3a49c9552 Merge pull request #41805 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-16 16:01:06 -06:00
Nicole Thomas
4c9a73d75f Merge pull request #41728 from twangboy/win_install_docs 
Win install docs
 2017-06-16 15:41:21 -06:00
Vladimir Pouzanov
49c9ced03f Log the exception context 2017-06-16 22:28:31 +01:00
Nicole Thomas
5d0db7b687 Merge pull request #41722 from garethgreenaway/41667_adding_additional_options 
Fixes to states/virt.py
 2017-06-16 15:24:18 -06:00
rallytime
ff277bc458 Add new documenation file references to build system for 2017.7 2017-06-16 21:17:33 +00:00
Ed Pelc
a536111b83 add tests for single docker log_config option fix 2017-06-16 14:57:17 -06:00
Ed Pelc
c90137cf1f fix(docker): allow log_driver or log_opt 
Docker allows either option without the other and the docks make no mention of both options being required.
 2017-06-16 14:57:17 -06:00
Nicole Thomas
1404423f97 Merge pull request #41806 from epelc/patch-1 
fix(docker): allow log_driver or log_opt
 2017-06-16 14:54:10 -06:00
Nicole Thomas
0183dd961d Merge pull request #41804 from terminalmage/master-tops 
Rename ext_nodes to master_tops in codebase
 2017-06-16 14:36:00 -06:00
Daniel Wallace
4bf030ff65 don't break py2 2017-06-16 13:11:51 -06:00
Nicole Thomas
14803ae1de Merge pull request #23 from cro/merge-2017.7 
Sometimes what gmtime returns looks like a float or other #.  Cast to str.
 2017-06-16 12:00:22 -06:00
rallytime
4780e99ac2 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-16 11:53:38 -06:00
C. R. Oldham
760c4758a9 Sometimes what gmtime returns looks like a float or other #. Cast to str. 2017-06-16 11:50:21 -06:00
Ed Pelc
7480bab798 add tests for single docker log_config option fix 2017-06-16 13:05:01 -04:00
Erik Johnson
e8d43a42d1 Rename ext_nodes to master_tops in codebase 
ext_nodes was replaced in favor of the master_tops system a few years
ago, this changes references in the codebase to refer to master_tops to
make the code more maintainable in the future.
 2017-06-16 11:44:30 -05:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
 2017-06-16 10:43:02 -06:00
Ed Pelc
a8affc6ce6 fix(docker): allow log_driver or log_opt 
Docker allows either option without the other and the docks make no mention of both options being required.
 2017-06-16 12:40:22 -04:00
garethgreenaway
01e6e7e02c Merge pull request #41800 from terminalmage/issue41781 
Don't take hostname from name param when creating docker container
 2017-06-16 09:40:21 -07:00
Erik Johnson
fd97426a8b Add versionchanged to document new functionality 2017-06-16 10:45:18 -05:00
jmacfar
dba9558b73 Support cp.get_file|url to download files to a directory 
Integrations tests
 2017-06-16 10:45:18 -05:00
Vladimir Pouzanov
5595f48181 Remove grains cache file in case if serialization failed for whatever reason. 2017-06-16 16:08:33 +01:00
Erik Johnson
83dcffb4b3 Don't take hostname from name param when creating docker container 
Resolves #41781.
 2017-06-16 10:02:31 -05:00
Daniel Wallace
b65edc786c handle unordered sets in unique jinja tests 2017-06-16 08:40:40 -06:00
Vladimir Pouzanov
a268c34542 Refactored grains cache loader. 
- refresh_grains_cache opt will now give a distinct debug message
  - if the grains fail to load from cache, or if the cache is vaild but is
    empty, grains will be reloaded
  - dramatically reduced nesting by extracting loader to dedicated function and
    inverting the condition clauses.
 2017-06-16 14:06:26 +01:00
Cléry Plassat
5e91974cb6 Merge branch 'develop' of github.com:plassa-b/salt into develop 2017-06-16 12:48:28 +02:00
Cléry Plassat
a7974fe508 Patched the windows status test 2017-06-16 12:48:15 +02:00
Luke Overend
92381d7b6d Update napalm_syslog engine to use auth class 
We have changed napalm-logs to have a keep alive so when the server
restarts the client automatically re-authenticates. This PR changes the
salt engine to make use of the new keep alive.

napalm-logs PR https://github.com/napalm-automation/napalm-logs/pull/87
 2017-06-16 09:48:27 +01:00
Vasili Syrakis
6d1fe4f6ea Merge remote-tracking branch 'origin/patch-3' into patch-3 2017-06-16 17:09:37 +10:00
Vasili Syrakis
370c9ab0b6 Converted cpu/ram to size_dict as discussed in #38814 2017-06-16 17:09:05 +10:00
Vasili Syrakis
bc7894bd97 Merge branch 'develop' of https://github.com/saltstack/salt into patch-3 2017-06-16 17:04:53 +10:00
Vasili Syrakis
11d45d2799 Merge branch 'develop' into patch-3 2017-06-16 16:41:06 +10:00
Ashish Disawal
8034d2d5db Fix for #41762 
https://github.com/saltstack/salt/issues/41762

iptables.build_rule does not give full rule even when full=True is provided

Changed as suggested by Daniel
Yes, that should be changed to if full is True
 2017-06-16 11:38:24 +05:30
Daniel Wallace
05f2c66604 handle bytes strings in mock_open 2017-06-15 22:43:40 -06:00