valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,800 Commits 24 Branches 182 Tags 341 MiB
fa8d672f9a
Commit Graph

83800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
97c20c20cb Import datetime 2017-07-03 16:37:31 -06:00
rallytime
291515e445 [PY3] Fix haproxyconn unit tests that are failing 
``assertItemsEqual`` does not exist in Python 3. It was removed. Since
``assertItemsEqual(a, b)`` is the same thing as asserting that
``sorted(a) == sorted(b)``, we can just update the test in this manner
to work in both Python 2 and 3.
 2017-07-03 16:25:57 -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
Mike Place
63fe8ff59f Merge pull request #41953 from yagnik/develop 
Fix loader to point to custom loader as opposed to base loader
 2017-07-03 16:58:32 -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
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
Jay
6e8c5dbe25 Update win_service.py 
Added .lower() to the IF statement.
 2017-07-03 13:17:32 -04:00
Damon Atkins
4fb2bb1856 Fix typo 2017-07-04 03:08:08 +10:00
Alexandru Bleotu
db94a858ec Added loading of decorated jinja_global functions 2017-07-03 17:29:15 +01:00
Alexandru Bleotu
119845c64f Added jinja_raise as 'raise' to be able to raise errors from jinja 2017-07-03 17:29:15 +01:00
Alexandru Bleotu
93640d1b02 Added decorator jinja_global to add functions as jinja globals 2017-07-03 17:28:57 +01: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
Mike Place
899fb6fc94 Merge pull request #42073 from glynnforrest/system-molly-guard-doc 
Add note to system module about wrapper scripts preventing shutdown
 2017-07-03 10:53:39 -05: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 changed the function calls in such a way that tests in 2017.7
now fail. This updates the mocking to account for new code paths
introduced in this commit.
 2017-07-03 10:43:34 -05:00
rallytime
4d96cc1068 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-07-03 09:28:18 -06: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 and covers all
refs to assert_called_once in the suite.
 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
Glynn Forrest
64fda9f331 Add note to system module about wrapper scripts preventing shutdown 
Fixes #42010
 2017-07-02 07:51:56 +01: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
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
Jay
dda8567161 Update win_service.py 
Removed some sneaky tabs
 2017-06-30 17:41:54 -04:00
Mike Place
286eaf9237 Merge pull request #42059 from pgporada/fix-grammar 
Fixes grammar
 2017-06-30 16:08:17 -05:00
Mike Place
e7bd8468ba Merge pull request #42011 from steverweber/dev_autodoc 
add module and state to help create txt docs from highstate data
 2017-06-30 16:03:16 -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
Mike Place
d36f0ec0f0 Merge pull request #42051 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-06-30 15:54:53 -05:00
Mike Place
3ee31ea25e Merge pull request #42057 from rallytime/ssh-unit-test 
Add mode back in for tmp file creation on Linux for ssh unit test
 2017-06-30 15:54:23 -05:00
Mike Place
e067020b9b Merge pull request #42055 from dmurphy18/handle_gnupgv21 
Upgrade support for gnupg v2.1 and higher
 2017-06-30 15:54:02 -05:00