valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,750 Commits 24 Branches 182 Tags 341 MiB
f15de66350
Commit Graph

80750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
f15de66350 Change method of getting system drive letter 2017-04-13 17:43:13 -06:00
Mike Place
dccc789a7e Merge pull request #40683 from gtmanfred/nitrogen 
make a list of kwargs keys
 2017-04-13 13:57:15 -06:00
Mike Place
cfc282f036 Merge pull request #40684 from cachedout/fix_netapi_lint 
Fix netapi lint
 2017-04-13 11:34:12 -06:00
Mike Place
54b5415ddd
Fix netapi lint 2017-04-13 11:33:12 -06:00
Daniel Wallace
f6761e6025 make a list of kwargs keys 
kwargs changes size in the for loop, so we need to instantiate a new list of
keys for the kwargs

Fixes #40682
 2017-04-13 11:14:51 -06:00
Mike Place
49d7124fe5 Merge pull request #40598 from mchugh19/batch_eauth 
Ensure batch uses passed eauth token or credentials
 2017-04-13 09:44:45 -06:00
Mike Place
4690633e0f Merge pull request #40659 from gtmanfred/ssh 
encode for py3
 2017-04-13 09:40:59 -06:00
Mike Place
14a5b43216 Merge pull request #40674 from Juniper/nitrogen 
new functions for junos modules (lock, unlock, load, commit_check) and changes to install_config
 2017-04-13 09:36:03 -06:00
rajvidhimar
060974f9b7 Fix doc for junos install_config in state module 2017-04-13 15:35:13 +05:30
rajvidhimar
50a4f94ec0 Add new functions in junos (lock, unlock, load, commit_check) and doc changes 2017-04-13 15:35:13 +05:30
Daniel Wallace
bfc34d4825 encode for py3 
Fixes #40434
 2017-04-12 15:32:07 -06:00
Christian McHugh
ee66c7ca38 re-add batch support to cherrypy saltapi 2017-04-12 22:07:15 +01:00
Nicole Thomas
ceedbf1a63 Merge pull request #40649 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-12 11:18:32 -06:00
Christian McHugh
d818137794 pop out of kwargs 2017-04-12 18:09:51 +01:00
Christian McHugh
10b53911f5 Create eauth dict for passing into batch class 2017-04-12 06:51:18 +01:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes 
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
 2017-04-11 16:49:15 -06:00
Mike Place
892d9a5511 Merge pull request #40648 from terminalmage/py3-gitfs-fix 
Fix gitfs' write_file functions for Python 3
 2017-04-11 16:21:33 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
Erik Johnson
e50dba7bf4 Fix gitfs' write_file functions for Python 3 
In PY3 both GitPython and Pygit2 expect the file to be opened in binary
write mode, as they write bytes and not strings.
 2017-04-11 16:01:20 -05:00
Nicole Thomas
4beb7b4e77 Merge pull request #40644 from rallytime/nitrogen-doc-update 
Add autodoc modules for new files in nitrogen
 2017-04-11 14:59:26 -06:00
Nicole Thomas
e1f5a5dfc3 Merge pull request #40645 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-11 14:59:13 -06:00
Nicole Thomas
5699b3bfc7 Merge pull request #40636 from terminalmage/fix-pillar-logging-regression 
Fix regression in merge conflict resolution
 2017-04-11 14:59:01 -06:00
Nicole Thomas
cef13c11ca Merge pull request #40611 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-11 14:58:03 -06:00
Mike Place
6c4ae3c914 Merge pull request #40642 from DSRCorporation/bugs/40594_ssh_cachedir 
Correctly resolve relative cache path to absolute.
 2017-04-11 14:43:57 -06:00
rallytime
8de6497933 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-11 13:41:07 -06:00
Nicole Thomas
2ae9eaa176 Merge pull request #40638 from rallytime/bp-40571 
Back-port #40571 to 2016.3
 2017-04-11 13:36:53 -06:00
rallytime
cd0adb82d6 Spelling fix 2017-04-11 13:35:38 -06:00
rallytime
3a232ffe8b Add autodoc modules for new files in nitrogen 2017-04-11 19:31:33 +00:00
Mike Place
8492cef7a5 Merge pull request #40609 from gtmanfred/2016.11 
stat_file when keep is set, instead of mirroring all file permissions
 2017-04-11 12:48:47 -06:00
rallytime
36f7a6481b Remove blacklisted loader usage of dunder variables 2017-04-11 12:16:15 -06:00
Dmitry Kuzmenko
055256c518 Correctly resolve relative cache path to absolute. 2017-04-11 21:15:29 +03:00
Erik Johnson
20f856f038 Update unit tests for numeric osmajorrelease 2017-04-11 12:36:36 -05:00
Erik Johnson
2d1c4be2df pkgrepo.managed: properly handle comments for debian 
Resolves #39778.
 2017-04-11 11:03:32 -06:00
Erik Johnson
23a6c924bd Fix regression in merge conflict resolution 
See a781a0d0d1 (commitcomment-21715967)
 2017-04-11 11:26:46 -05:00
Erik Johnson
6cf9202bc8 Fix more formatting issues in nitrogen release notes 
The wildcard versions docs should be grouped under the same top-level
bullet. Also, there was a stray execution module change that seems to
have tried to flee south. I have returned it to it's natural habitat.
 2017-04-11 11:02:58 -05:00
Erik Johnson
c36c9465e6 Formatting fixes for the module.run changes 
This fixes the RST formatting so that it renders properly in the
bulleted list format. It also makes some changes to the wording for
clarification purposes.
 2017-04-11 11:02:58 -05:00
Erik Johnson
3bbebd7d82 os_release -> osmajorrelease 
This is a typo fix
 2017-04-11 11:02:58 -05:00
Erik Johnson
8b41b80b17 Force osmajorrelease grain to be an int 
This is a scheduled change for Nitrogen that we missed before branching.
 2017-04-11 11:02:58 -05:00
Mike Place
4e44fceeec Merge pull request #40618 from twangboy/fix_py3_installer 
Fix Py3 Installer
 2017-04-11 08:46:59 -06:00
Mike Place
05ac613ecf Merge pull request #40620 from mateiw/2016.11-suse-saltapi-service 
SUSE specific changes to salt-api.service
 2017-04-11 08:44:59 -06:00
Matei Albu
ee911a74b4 suse specific changes to salt-api.service 
* run service under user salt
 * change type from notify to simple
 * set SHELL env var. When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed execute the given command
 2017-04-11 09:19:23 +02:00
twangboy
f71d5cccde Copy pywin32 dlls to python directory 2017-04-10 23:51:11 +00:00
Mike Place
b0a2414d68 Merge pull request #40614 from gtmanfred/tcp 
add retries on authentications of the salt minion reconnecting
 2017-04-10 16:42:16 -06:00
Mike Place
f7e121a9ee Merge pull request #40606 from kaszuba/fix-dockerng-sls 
Use correct exec_driver in dockerng.sls module
 2017-04-10 16:25:30 -06:00
Mike Place
b6cf948afe Merge pull request #40615 from rallytime/fix-39863 
Call out to _pki_minions() once, rather than in a loop in _check_list_minions()
 2017-04-10 16:22:17 -06:00
rallytime
1a9f03ab92 Call out to _pki_minions() once, rather than in a loop in _check_list_minions() 
Fixes #39863
 2017-04-10 15:09:58 -06:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
rallytime
67d08f60ff Fixup fileclient_test file to conform to new standards 2017-04-10 14:09:41 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
 2017-04-10 14:09:25 -06:00
Daniel Wallace
6e34c2b5e5 stat file when placing it on server instead of caching 
remove chmod of files in the fileserver
add stat_file to cp module
use cp.stat_file to get file mode in file module
add a note about keep not working with ssh
 2017-04-10 13:03:04 -06:00