Daniel Wallace
db0ed458d8
Update salt-master first before updating salt-minion
...
Fixes #42124
2017-07-05 10:23:07 -06:00
Erik Johnson
d15f7ded82
Add integration test for 42116
2017-07-05 11:07:38 -05:00
Erik Johnson
c312e10cf9
Fix regression when CLI pillar override is used with salt-call
2017-07-05 11:03:27 -05:00
Nicole Thomas
9197055ea5
Merge pull request #42084 from terminalmage/assert-called-once
...
Fix usage of assert_called_once in Python 3 < 3.6
2017-07-05 09:22:39 -06:00
rallytime
8b35b367b3
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_pkg.py
- salt/states/dockerng.py
2017-07-05 09:14:30 -06:00
Erik Johnson
d14291267f
Fix pillar.get when saltenv is passed
2017-07-05 02:00:54 -05:00
Erik Johnson
4780d7830a
Merge pull request #42078 from damon-atkins/fix_convert_flt_str_version_on_cmd_line
...
pkg.install and pkg.remove fix version number input.
2017-07-05 01:04:56 -05:00
Erik Johnson
9a268949e3
Add integration test for 42116
2017-07-05 00:48:50 -05:00
Erik Johnson
1bb42bb609
Fix regression when CLI pillar override is used with salt-call
2017-07-05 00:19:24 -05:00
Mike Place
46d575acbc
Merge pull request #42105 from Ch3LL/update_rc
...
Update releasecanddiate doc with new 2017.7.0rc1 Release
2017-07-03 22:14:41 -05:00
Ch3LL
d4e7b91608
Update releasecanddiate doc with new 2017.7.0rc1 Release
2017-07-03 23:06:54 -04:00
Mike Place
965583fa55
Merge pull request #42097 from gtmanfred/timediff
...
require large timediff for ipv6 warning
2017-07-03 20:02:23 -05:00
Mike Place
97c20c20cb
Import datetime
2017-07-03 16:37:31 -06:00
Mike Place
d38548bbbd
Merge pull request #42099 from rallytime/fix-41885
...
Remove references in docs to pip install salt-cloud
2017-07-03 17:13:44 -05:00
Mike Place
628e52d740
Merge pull request #42098 from twangboy/win_repo_docs
...
Change repo_ng to repo-ng
2017-07-03 17:12:46 -05:00
Mike Place
41514b886e
Merge pull request #42096 from twangboy/win_use_default_configs
...
Use default salt configs for Windows installs
2017-07-03 17:03:26 -05:00
rallytime
c2822e05ad
Remove references in docs to pip install salt-cloud
...
Instead, provide the option to use "-L" with the Bootstrap script.
Fixes #41885
2017-07-03 14:47:36 -06:00
Daniel Wallace
d5f91fe9b0
require large timediff for ipv6 warning
2017-07-03 14:24:36 -06:00
twangboy
5a5d70866a
Change repo_ng to repo-ng
2017-07-03 14:15:35 -06:00
twangboy
c1e899c0ca
Create Master installer if script is found
2017-07-03 13:54:27 -06:00
Mike Place
aef6963d07
Merge pull request #42089 from gtmanfred/spm
...
pass cachedir from kwargs in cache
2017-07-03 14:41:48 -05:00
Mike Place
24a7d85b87
Merge pull request #42090 from twangboy/win_add_salt_bat
...
Add missing batch file
2017-07-03 14:40:56 -05:00
twangboy
7da86b3540
Use default salt configs for Windows installs
2017-07-03 13:33:24 -06:00
Erik Johnson
bd27870a71
Add debug logging to dockerng.login
...
This can be used with debug logging enabled to troubleshoot which
registries this function is attempting to authenticate.
2017-07-03 13:30:01 -05:00
Erik Johnson
47d61f4edf
Prevent command from showing in exception when output_loglevel=quiet
...
When a command is being executed using salt.utils.timed_subprocess.TimedProc,
and that command does not exist in the PATH, it will result in an
OSError/IOError being raised. We catch this and then raise a
CommandExecutionError with some information, including the command being
run. However, when output_loglevel=quiet, we don't want any details of
the command to be visible.
This commit redacts the command details in these corner cases.
2017-07-03 13:16:57 -05:00
Damon Atkins
09d37dd892
Fix comment typo
2017-07-04 03:48:04 +10:00
Damon Atkins
7167549425
Handle version=None when converted to a string it becomes 'None'
...
parm should default to empty string rather than None, it would fix better with existing code.
2017-07-04 03:30:44 +10:00
Damon Atkins
4fb2bb1856
Fix typo
2017-07-04 03:08:08 +10:00
twangboy
e4183a6d1c
Fix comments
2017-07-03 10:27:04 -06:00
twangboy
984b736e14
Add missing batch file
2017-07-03 10:24:10 -06:00
Daniel Wallace
1c495ced3c
pass cachedir from kwargs in cache
2017-07-03 09:55:19 -06:00
Erik Johnson
81d606a8cb
Merge pull request #42086 from redmatter/fix-dockerng-volume-present-result
...
Make result=true if Docker volume already exists
2017-07-03 10:48:32 -05:00
Erik Johnson
fc27c1a948
Update mocking in network tests
...
017fbdb
2017-07-03 10:43:34 -05:00
Andrew Bulford
2e1dc95500
Make result=true if Docker volume already exists
...
In other states the result is always returned as `True` if no change is
required, whether `test=True` is set or not.
Fixes #42076
2017-07-03 16:19:04 +01:00
Andrew Bulford
8d549685a7
Make result=true if Docker volume already exists
...
In other states the result is always returned as `True` if no change is
required, whether `test=True` is set or not.
Fixes #42076
2017-07-03 16:08:16 +01:00
Erik Johnson
fdb8531724
Merge pull request #42071 from garethgreenaway/42070_state_runs_via_salt_ssh
...
fix to ssh/wrapper/state.sls
2017-07-03 09:43:57 -05:00
Erik Johnson
d942752e95
Fix usage of assert_called_once in Python 3 < 3.6
...
This is a more complete fix which builds upon 41c65b0
2017-07-03 09:30:12 -05:00
Damon Atkins
cf55c3361c
pkg.install and pkg.remove on the command line take number version numbers,
...
store them within a float. However version is a string, to support versions
numbers like 1.3.4
The following for example would not work as version would be a float, and a
float does not match a string a dict with key of strings.
c:\salt\salt-call -l debug pkg.install name=softwarename version=3.1
2017-07-03 19:27:00 +10:00
Gareth J. Greenaway
e9c8a4a225
When building up the remote file location nothing was being returned via _thin_dir so the remote path was starting with None. This change updates _thin_dir to return a value for format to use.
2017-07-01 17:44:16 -07:00
Mike Place
b95b165d0e
Merge pull request #42066 from terminalmage/thin-dir-py3
...
salt-ssh: get thin_dir from master_opts if not in opts
2017-06-30 20:32:22 -05:00
Erik Johnson
7e59d68910
salt-ssh: get thin_dir from master_opts if not in opts
2017-06-30 20:29:25 -05:00
Mike Place
9eb8ea5b33
Merge pull request #42025 from terminalmage/move-mkstemp
...
Move salt.utils.files.mkstemp temporarily back to salt.utils
2017-06-30 20:14:29 -05:00
Erik Johnson
ed1e773dfc
Move salt.utils.files.mkstemp temporarily back to salt.utils
...
Old code from earlier branches may cause problems when merging forward,
this moves the function back to its old location and we will work on
getting it permanently renamed in develop.
2017-06-30 18:24:50 -05:00
Daniel Wallace
fd4458b6c7
import salt.minion for EventReturn for Windows
...
Because of the way our multiprocessing works on Windows, this module is not
available. In Linux, the namespace is copied over, and the module is
available, so we only need the import on Windows.
2017-06-30 16:52:28 -06:00
Mike Place
1bdb2f668b
Merge pull request #42061 from terminalmage/fix-loader-subdir
...
LazyLoader: fix loading module from a subdir
2017-06-30 17:44:07 -05:00
Mike Place
5b2ae2dd04
Merge pull request #42062 from terminalmage/arch-grains-test
...
Add debug logging for grains tests
2017-06-30 16:58:15 -05:00
Mike Place
7160697123
Merge pull request #42021 from gtmanfred/2016.11
...
Set concurrent to True when running states with sudo
2017-06-30 16:02:15 -05:00
Mike Place
b784fbbdf8
Merge pull request #42029 from terminalmage/host_to_ips
...
Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips
2017-06-30 15:58:55 -05:00
Mike Place
ec378c73ff
Merge pull request #42020 from terminalmage/toctree-fix
...
Add the new docker state modules to the toctree
2017-06-30 15:58:27 -05:00
Mike Place
9548588c79
Merge pull request #42050 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-06-30 15:58:01 -05:00
