valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,030 Commits 24 Branches 182 Tags 341 MiB
2cfabc467c
Commit Graph

82030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
2cfabc467c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/req.txt
  - salt/modules/dockermod.py
 2017-06-19 14:17:01 -06: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
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
be0e9abedb Merge pull request #41776 from gtmanfred/2016.11 
npm 5.0.0 added a second line after fsevents
 2017-06-19 11:53:42 -05:00
Mike Place
5bc7a20327 Missing colon 2017-06-19 10:52:45 -06:00
Mike Place
d94d4e4d19 Merge pull request #41783 from rallytime/config-doc-updates 
Add a bunch of config options to the various master/minion files that are missing
 2017-06-19 11:42:54 -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
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
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
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
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
garethgreenaway
2c681887d3 Merge pull request #41816 from twangboy/update_psutil_req 
Upgrade psutil to version 5.2.2
 2017-06-16 18:51:28 -07:00
twangboy
8b4e3ad77d Upgrade psutil to version 5.2.2 2017-06-16 17:59:50 -06:00
Nicole Thomas
3e5fe7ca4b Merge pull request #41803 from terminalmage/issue41785 
Don't log an error when no top.sls is found
 2017-06-16 16:49:07 -06: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
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
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
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
garethgreenaway
d12bc4ee68 Merge pull request #41801 from terminalmage/issue41781-2016.11 
Don't take hostname from name param when creating docker container (2016.11 branch)
 2017-06-16 10:02:01 -07: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
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
f9f4d49f05 Don't log an error when no top.sls is found 
It is a valid use case to only derive your SLS matches via master_tops,
so it should not be considered an error if no top file matches are
found.
 2017-06-16 11:07:56 -05:00
Erik Johnson
8236d3e1c3 Don't take hostname from name param when creating docker container (2016.11 branch) 2017-06-16 10:05:35 -05: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
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
Daniel Wallace
05f2c66604 handle bytes strings in mock_open 2017-06-15 22:43:40 -06:00
Daniel Wallace
4f7c6d1161 use our own mock_open 
test.support.mock.mock_open specifies a side effect so that if you constantly
read a mocked open call, it will only iterate through it once, and then after
it will appear as if the end of the file has been reached.

This is needed for salt.modules.cp.push to be tested correctly.
 2017-06-15 17:50:35 -06:00
rallytime
c828ad803a Add a bunch of config options to the various master/minion files that are missing 
I started on these a while ago and never submitted them. I added a couple more today
and figured I should get these in.

Refs #32400
 2017-06-15 16:21:47 -06:00
Mike Place
87e2e72d94 Merge pull request #41768 from rallytime/bp-41615 
Manually back-port the changes in PR #41615
 2017-06-15 15:41:44 -05:00
Mike Place
a46f6809df Merge pull request #41758 from twangboy/docs_win_add_master_config 
Add Windows Master config information
 2017-06-15 15:29:27 -05:00
Daniel Wallace
733a2279ca npm 5.0.0 added a second line after fsevents 
Remove that line from so we only get the json
 2017-06-15 14:00:31 -06:00
Mike Place
b12611d122 Merge pull request #41617 from cro/n_proxy_tests 
Port salt-proxy tests to the testsuite changes in Nitrogen.
 2017-06-15 12:07:29 -05:00
twangboy
b6201bac33 Fix version numbers 2017-06-15 09:53:57 -06:00
twangboy
c3dc38587e Fix indentation 2017-06-15 09:49:13 -06:00
Mike Place
36cb223ab2 Merge pull request #41740 from terminalmage/zd1532 
Fix spurious error when glob/regex used in publisher_acl
 2017-06-15 10:14:56 -05:00
Mike Place
d8b83af3d6 Merge pull request #41745 from terminalmage/fix-runtests-helpers 
Fix runtests_helpers.modules_available when multiple modules passed
 2017-06-15 10:14:16 -05:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen 
Update Nitrogen references to 2017.7.0
 2017-06-15 10:12:18 -05:00
Mike Place
126a36747b Merge pull request #41749 from terminalmage/parse_targets 
Fix bug in pkg_resource.parse_targets when version passed
 2017-06-15 10:05:52 -05:00
Mike Place
b6b3eb1aa1 Merge pull request #41767 from rallytime/exit_status_test 
Disable new part of test_exit_status_correct_usage test for now
 2017-06-15 10:02:02 -05:00
Mike Place
fbd27744e4 Merge pull request #41764 from cloudflare/fix-capirca 
Add new term field for capirca Term class
 2017-06-15 09:59:13 -05:00