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
91,627 Commits 24 Branches 182 Tags 341 MiB
47f82c6f39
Commit Graph

91627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ronald van Zantvoort
47f82c6f39
Merge branch 'develop' into docker-prune 2018-03-03 18:52:30 +01:00
Ronald van Zantvoort
e60a68884c
Merge pull request #1 from terminalmage/pr-46176 
Bugfixes, tweaks, tests for docker.prune
 2018-03-03 15:40:21 +01:00
Erik Johnson
e8b940242c
Add unit test for docker.prune 2018-03-03 01:47:00 -06:00
Erik Johnson
6ac96ac416
Bugfixes, tweaks for docker.prune 
The kwargs argument isn't supported and attempting to pass it to the API
will result in API errors. This fixes that bug and makes improvements to
the docstring.

It also changes the behavior of the `system` argument so that it doesn't
need to be manually disabled to prune only containers/images/etc.

Finally, it moves the prune function higher up to fit with the
organizational structure of the module.
 2018-03-03 01:46:34 -06:00
Nicole Thomas
5f88d64dc0
Merge pull request #46186 from nicholasmhughes/add-additional-azurearm-modules 
Add Additional Azure ARM Modules
 2018-03-02 16:49:07 -05:00
Nicole Thomas
218c2af39d
Merge pull request #46197 from terminalmage/split-input-map 
Add mapper to salt.utils.args.split_input()
 2018-03-02 16:48:17 -05:00
Nicole Thomas
b7414d822d
Merge pull request #46229 from smarsching/svn-trust-failures 
Add trust_failures option to svn.export and svn.latest.
 2018-03-02 16:45:41 -05:00
Nicole Thomas
d1d966abc7
Merge pull request #46302 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-03-02 16:27:45 -05:00
Nicole Thomas
f5ff692cfc
Merge pull request #46303 from Ch3LL/rc_docs 
Update releasecandidate doc for 2018.3.0rc1
 2018-03-02 13:42:03 -05:00
Ch3LL
52a68450ae
Update releasecandidate doc for 2018.3.0rc1 2018-03-02 12:02:21 -05:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/auth/ldap.py
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/cmd.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
  - tests/integration/scheduler/test_postpone.py
  - tests/unit/grains/test_core.py
 2018-03-02 11:55:06 -05:00
Nicole Thomas
28152ff98d
Merge pull request #46142 from garethgreenaway/port_46084_develop 
[develop] Porting various scheduler fixes from Oxygen to develop
 2018-03-02 11:39:49 -05:00
Gareth J. Greenaway
5fe32a9fb3
Fixing a couple typos. Adding missing job name variable into functions that use it in error reporting. Fixing up various strings used in error reporting and logging. 2018-03-01 16:02:22 -08:00
Gareth J. Greenaway
701c7f90b4
Include PR https://github.com/saltstack/salt/pull/46267 2018-03-01 16:02:22 -08:00
Gareth J. Greenaway
4f24c546e3
Include https://github.com/saltstack/salt/pull/46190 2018-03-01 16:02:22 -08:00
Gareth J. Greenaway
cde50c6dab
Fixing lint 2018-03-01 16:02:21 -08:00
Gareth J. Greenaway
2aa9a84b28
Adding changes from #45323 2018-03-01 16:02:21 -08:00
Gareth J. Greenaway
65561441e5
Add changes from PR #46143 to develop 2018-03-01 16:02:21 -08:00
Gareth J. Greenaway
e23da417d5
Fixing a couple typos. Converting the code to handle after & until to sub functions. 2018-03-01 16:02:21 -08:00
Gareth J. Greenaway
dcc5deaea5
Porting #46084 to Develop 2018-03-01 16:02:21 -08:00
Nicole Thomas
7731ffae20
Merge pull request #46289 from rallytime/update-release-notes 
Port 2018.3.0.rst release note changes to develop
 2018-03-01 17:12:08 -05:00
Sebastian Marsching
fe8c5ea1d5 Add trust_failures option to svn.export and svn.latest. 
If set, the value of this option is passed to svn using the
--trust-server-cert-failures option. This is useful for cases where
using the --trust-server-cert option (as enabled by the trust option of
the states) is not sufficient. One example of such a case is when the
host name of the SVN server does not match the name in the certificate.
 2018-03-01 22:26:14 +01:00
Nicole Thomas
4df31ac297
Merge pull request #46248 from garethgreenaway/45325_display_usage_for_runners 
[develop] display usage for runners when missing arguments
 2018-03-01 14:44:18 -05:00
rallytime
18eca3da3b
Port 2018.3.0.rst release note changes to develop 2018-03-01 14:24:10 -05:00
Gareth J. Greenaway
cd018c05d4
Fixing typo in test_jobs. Fixing lint. 2018-03-01 07:56:55 -08:00
Nicole Thomas
7382654c70
Merge pull request #46227 from Ch3LL/smtp_file_client 
Mock file_client call in smtp return test
 2018-02-28 17:12:22 -05:00
Nicole Thomas
123625213e
Merge pull request #46232 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-28 14:16:36 -05:00
Nicole Thomas
20d869c228
Merge pull request #46172 from The-Loeki/fix_cmd_run_all_bg_oxygen 
cmdmod: reimplementation of #45932 for Oxygen
 2018-02-28 14:14:26 -05:00
Nicole Thomas
1bb4ef6bc8
Merge branch 'develop' into add-additional-azurearm-modules 2018-02-28 14:13:39 -05:00
Nicole Thomas
806ab23775
Merge pull request #46218 from The-Loeki/docker-events-filter 
engine.docker_events: Add filter
 2018-02-28 14:09:13 -05:00
Nicole Thomas
687575b582
Merge pull request #46238 from terminalmage/fds-in-fopen 
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr
 2018-02-28 14:08:22 -05:00
Nicole Thomas
1953532b2a
Merge pull request #46111 from alexvasiu/develop 
modules/nilrt_ip.py: Change get_interfaces_details
 2018-02-28 13:53:15 -05:00
Nicole Thomas
3da5dcb313
Merge pull request #46219 from twangboy/win_fix_inet_pton 
Fix `unit.modules.test_network` for Windows
 2018-02-28 10:45:01 -05:00
Nicole Thomas
a0869fe533
Merge branch 'develop' into develop 2018-02-28 10:38:55 -05:00
Nicole Thomas
44343f8063
Merge pull request #46228 from twangboy/win_fix_test_pip 
Fix `unit.modules.test_pip` for Windows
 2018-02-28 10:37:48 -05:00
Gareth J. Greenaway
6534f18be6
Adding tests. 2018-02-28 07:32:07 -08:00
rallytime
04f24c1794
Lint: fix from a bad merge 
The TestJinjaDefaultOptions test class ended up with the TestCustomExtensions
class definition. This changes the bad merge back to the TestCase class.
 2018-02-28 09:18:27 -05:00
Ronald van Zantvoort
3ecf5018d0
Merge branch '2018.3' into fix_cmd_run_all_bg_oxygen 2018-02-28 14:41:53 +01:00
Erik Johnson
498f0db4ff
Return a list, not an iterator! 2018-02-27 23:43:39 -06:00
Erik Johnson
ae8a2718cf
Add mapper to salt.utils.args.split_input() 
This allows for one to pass a function reference as a second argumment
to split_input, which will be used to perform conversion on the split
input. This is useful for instances where we want to get a list of ints
out of a Salt CLI arg like foo=1,2,3. With the pre-existing code, this
would force you to either manually run something like:

map(int, salt.utils.args.split_input(val))

With this PR, you can now run:

salt.utils.args.split_input(val, int)
 2018-02-27 23:43:39 -06:00
Erik Johnson
fe1527a3c4
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr 
It's like crossing the streams. h/t @garethgreenaway
 2018-02-27 18:39:54 -06:00
Ronald van Zantvoort
60a668f44b
Update docker_events.py 2018-02-28 00:10:17 +01:00
Gareth J. Greenaway
0e177e713d
Catch TypeError when not all required arguments are passed to a runner. Display error and usage. 2018-02-27 14:29:32 -08:00
rallytime
aad61c77bd
Update old utils paths to new paths 2018-02-27 17:20:45 -05:00
rallytime
7243baf2c0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/orchestrate/orchestrate_runner.rst
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/pillar/ec2_pillar.py
  - salt/runner.py
  - salt/utils/ssh.py
  - tests/integration/modules/test_cp.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_file.py
  - tests/unit/modules/test_git.py
 2018-02-27 17:13:28 -05:00
twangboy
415821eee9
Fix encoding issue 2018-02-27 14:38:07 -07:00
Ch3LL
280dc9a2b6
Mock file_client call in smtp return test 2018-02-27 16:36:38 -05:00
Nicole Thomas
633e1208e4
Merge pull request #46221 from terminalmage/salt-jenkins-854 
Fix hanging tests in integration suite
 2018-02-27 16:32:25 -05:00
Erik Johnson
0eb012659c
Fix hanging tests in integration suite 
A recent change to nginx appears to be causing this test to fail to
cache the test file in the temp nginx instance we've spun up. This
causes the return of cp.cache_file to be False, which in and of itself
should be enough to fail the test. But since we're not asserting on the
cp.cache_file results, flow proceeds to the next block of code, in which
we open the "file" that we cached. Some genius thought it would be a
swell idea to make io.open() successfully open a filehandle when the
path passed to it is a boolean False. When you try to read from this
filehandle, an AMAZING thing happens... It just blocks. Forever. I know,
right? Pure genius.

This commit adds an assert so that the test fails gracefully and doesn't
try to read from a bogus filehandle that SHOULDN'T EVEN EXIST.
 2018-02-27 13:32:57 -06:00
twangboy
46f1d2cc09
Use six.text_type instead of six.u 2018-02-27 12:26:51 -07:00