valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,993 Commits 24 Branches 182 Tags 341 MiB
8a84b3b963
Commit Graph

80993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ronald van Zantvoort
43277b2a8d cache roster doc fixes 2017-04-11 22:59:11 +02: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
twangboy
0f7a81cd34 Keep network.py execution module 2017-04-11 14:13:31 -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
twangboy
021783dbae Add unicode_literals import 2017-04-11 10:34:19 -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
Daniel Wallace
b21bc7528f if grain is defined as None still convert in append 
Fixes #40624
 2017-04-11 09:45:16 -06:00
Mike Place
33a6224dcf
Set minion test to use default opts 2017-04-11 09:28:19 -06:00
Mike Place
96870141b0 Merge pull request #40555 from The-Loeki/dns-enh 
DNS utils p3
 2017-04-11 08:58:16 -06:00
Mike Place
b2870cd4c2 Merge pull request #40613 from Venafi/develop 
Updated documentation for Venafi module with better examples & clarif…
 2017-04-11 08:48:35 -06:00
Mike Place
4d24fc2666 Merge pull request #40617 from rallytime/oxygen-release-notes 
Start release notes file for Oxygen
 2017-04-11 08:47:39 -06: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
7fbdede638 Merge pull request #40619 from pgporada/update-docs-for-set_selinux_context 
Update docs for file.set_selinux_context
 2017-04-11 08:45:19 -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
Mike Place
acdda46382 Merge pull request #40623 from vutny/git-bootstrap-alpine-initscripts 
Add OpenRC init scripts for bootstrapping Alpine Linux from Git
 2017-04-11 08:44:14 -06:00
Anas Abognah
28f7744cb6 Fixing issue # 40167 with file.replace where the diff output does not 
display correctly.
 2017-04-11 10:26:12 -04:00
Ronald van Zantvoort
24adf57814 DNS2: pylint fixes 2017-04-11 14:52:16 +02:00
Ronald van Zantvoort
4e573a93e6 DNS2: Add some docs 2017-04-11 13:17:51 +02:00
Ronald van Zantvoort
fba643a64f DNS2: Add nslookup tests 2017-04-11 13:11:35 +02:00
Ronald van Zantvoort
de6b97c03f DNS2: Py3 fix 2017-04-11 11:10:35 +02:00
Ronald van Zantvoort
8e37eab1cb DNS2: Raise ValueError on wrong DNS type plus testing 2017-04-11 11:03:19 +02: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
Ronald van Zantvoort
f9d3fbb379 DNS2: Re-add DNSSEC test, add tests for host 2017-04-11 09:02:53 +02:00
Phil Porada
66766b5685
The module was not the right place to put the yaml block. That should be moved to the state. 2017-04-10 22:57:56 -04:00
Phil Porada
013a04d861
Added another example of how to use the module when it's inside an SLS file. 2017-04-10 22:32:33 -04:00
Phil Porada
5f3f48b89e
Added the <user> declaration for the SELinux context to the documentation. Added an example of the module actually being used. 2017-04-10 22:26:41 -04:00
twangboy
f71d5cccde Copy pywin32 dlls to python directory 2017-04-10 23:51:11 +00:00
rallytime
5acaee2d5d Start release notes for Oxygen 2017-04-10 16:44:58 -06: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
1a331b4b2e Merge pull request #40590 from bodhi-space/infra4376 
INFRA-4376 - Several boto_rds fixes and improvements
 2017-04-10 16:36:39 -06:00
Mike Place
523918c4a8 Merge pull request #40599 from sjorge/logadm-state 
Logadm state
 2017-04-10 16:35:57 -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
c56247c105 Merge pull request #40608 from pcn/patch-1 
Fix confusing typo in thorium start page
 2017-04-10 16:24:48 -06:00
Mike Place
ec1c9f6fda Merge pull request #40610 from cheald/develop 
Add `env` support for rvm.installed and rvm.do, `opts` support for .installed
 2017-04-10 16:24:00 -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