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
74,999 Commits 24 Branches 182 Tags 341 MiB
8f986b28dc
Commit Graph

74999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
8f986b28dc Remove release candidate doc ref from 2016.11.0 release notes (#37931) 2016-11-28 13:49:28 -07:00
Thomas S Hatch
3d2dabc7b7 Merge pull request #37930 from cachedout/fix_comp 
Remove dictionary comprehension in netusers
 2016-11-28 13:27:06 -07:00
Mike Place
670e83200b
Remove dictionary comprehension in netusers 2016-11-28 13:24:44 -07:00
Nicole Thomas
0f8b187d15 Merge pull request #37923 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-28 12:55:03 -07:00
Thomas S Hatch
14271156f6 Add a release notes reference to the docker-sls tutorial (#37927) 2016-11-28 12:54:17 -07:00
rallytime
da7f5518eb Don't let 2016.3 doc config changes overwrite the 2016.11 changes 2016-11-28 11:09:35 -07:00
rallytime
dfedd1185a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/ddns.py
  - salt/templates/rh_ip/network.jinja
 2016-11-28 11:08:19 -07:00
Nicole Thomas
c35ba1f390 Merge pull request #37916 from rallytime/doc-update-2016.3 
[2016.3] Update version numbers in doc config for 2016.11.0 release
 2016-11-28 10:09:08 -07:00
Nicole Thomas
d204099db8 [2016.11] Update version numbers in doc config for 2016.11.0 release (#37917) 2016-11-28 10:08:52 -07:00
rallytime
bd40592289 [2016.3] Update version numbers in doc config for 2016.11.0 release 2016-11-28 09:18:38 -07:00
Mike Place
e13a2488c8 Merge pull request #37785 from Cloudtek/ddns-respect-trailing-dot 
respect trailing dot in ddns name parameter
 2016-11-28 16:02:10 +02:00
Mike Place
ee00592995 Merge pull request #37890 from bbinet/fix-genthin-six 
Fix support for extra_mods='six' to add six module to a thin.tgz tarball
 2016-11-28 15:53:06 +02:00
Mike Place
c03b389422 Merge pull request #37895 from fj40crawler/fix-augeas-return-for-test 
Change return value for salt/states/augeas.py to be True instead of N…
 2016-11-28 15:49:27 +02:00
Mike Place
fdbc31e8d8 Merge pull request #37907 from Talkless/patch-2 
Fix server trust in test run of svn.latest
 2016-11-28 15:47:39 +02:00
Daniel Boughton
ddc238df36 Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode 2016-11-27 08:40:05 -05:00
Daniel Boughton
ef75c459c0 Merge branch '2016.3' of github.com:saltstack/salt into fix-augeas-return-for-test 2016-11-27 08:38:23 -05:00
Vincas Dargis
072a319490 Fix server trust in test run of svn.latest 
Add missing --trust-server-cert option while running svn.latest in test=True mode
 2016-11-27 15:29:16 +02:00
Mike Place
f39fdf443f Merge pull request #37896 from toanju/2016.3 
rh networking: add missing values
 2016-11-27 12:30:35 +02:00
Tobias Jungel
c95304188e rh networking: add missing values 
this patch enables configuration of NETWORKDELAY= and DEVTIMEOUT= in
/etc/sysconfig/network
 2016-11-25 21:29:22 +01:00
Daniel Boughton
b0fe0cd256 Change return value for salt/states/augeas.py to be True instead of None for cases where salt is run with test=True. Fixes #37870 2016-11-25 14:14:29 -05:00
Bruno Binet
7fceaa3476 Fix support for extra_mods='six' to add six module to a thin.tgz tarball 
Without this patch, gen_thin will only include py2/salt/ext/six.py
but not py2/six.py (which may be required for other selected extra_mods
python modules)
 2016-11-25 11:27:31 +01:00
Mike Place
ea935c5a91 Merge pull request #37886 from bdrung/fix-typos 
Fix various spelling mistakes
 2016-11-25 04:59:36 +02:00
Benjamin Drung
9a51ba5c5b Fix various spelling mistakes 2016-11-24 16:00:31 +01:00
Mike Place
371b0a86d9 Merge pull request #37736 from dhaines/issue-37732 
handle semodule version >=2.4 (#37732) and fix typo
 2016-11-24 03:44:20 +02:00
Mike Place
87aeb66fbf Merge pull request #37797 from clan/extfs 
check count of columns after split
 2016-11-24 03:28:59 +02:00
Mike Place
f7c7109152 Merge pull request #37762 from twangboy/fix_chocolatey_state 
Add pre_versions to chocolatey.installed
 2016-11-24 03:27:29 +02:00
Nicole Thomas
56baa92d55 Merge pull request #37866 from meaksh/2016.3-bp-37149-36938-36784 
Backport #37149 #36938 and #36784 to 2016.3
 2016-11-23 14:54:17 -07:00
Nicole Thomas
d0cc7f0d56 Merge pull request #37863 from rallytime/bp-36893 
Back-port #36893 to 2016.3
 2016-11-23 10:09:09 -07:00
Mihai Dinca
9d8d578109 Fix pkg.latest_version when latest already installed 2016-11-23 17:02:40 +00:00
Joerg Reuter
ffca0d491c - acl.delfacl: fix position of -X option to setfacl 2016-11-23 17:02:32 +00:00
rallytime
3dfed6b841 Adjust linux_acl unit test argument ordering 2016-11-23 17:02:23 +00:00
Silvio Moioli
f185ecdde1 core.py: quote style fixed 2016-11-23 17:02:07 +00:00
Pablo Suárez Hernández
8404d13424 Setting up OS grains for SLES Expanded Support (SUSE's Red Hat compatible platform) 2016-11-23 17:01:54 +00:00
Erik Johnson
47d21d9ed2 Don't skip pillar compilation when master_type=='disable' (#37843) 
This was broken in pull #32521. The community member who opened that PR
was apparently unaware of the fact that masterless minions will use the
Pillar instead of RemotePillar class, so skipping the Pillar compilation
here results in the packed pillar dunder being completely empty.

This PR fixes that by removing the check for master_type and allowing
local pillar data to be compiled.
 2016-11-23 09:43:01 -07:00
Sergey Kizunov
16ce844c54 Eliminate warning when 'ssl' not set (#37849) 
When not specifying 'ssl' in a config file, the following warning
is displayed:

`[WARNING ] Key 'ssl' with value None has an invalid type of NoneType,
a dict is required for this value`

This has been caused by PR #37776.

Fix this by allowing `None` as a valid value for `ssl`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-11-23 09:40:28 -07:00
Dmitry Kuzmenko
0c607ccaec An example configuration for TLS/SSL. (#37859) 2016-11-23 09:38:16 -07:00
rallytime
4c70534991 Add versionadded to reauth option in dockerng module 2016-11-23 08:57:53 -07:00
Tyler Hunt
5ca2c388c2 added documentation for the new reuth option in docker registry configuration 
also fixed a typo in the new code where I used cred instead of creds
 2016-11-23 08:54:36 -07:00
Tyler Hunt
5b0c11ab47 add option to force a reauth for a docker registry 
Fixes #32829. Adds ability to specify reauth in the docker-registry pillar data structure to specify the reauth kwarg to docker-py login call. If not specified it defaults to old behaviour of False
 2016-11-23 08:54:36 -07:00
Sebastian Vela
b17a118e72 add multiline encryption documentation to nacl (#37847) 2016-11-22 15:27:13 -07:00
David J. Haines
7ef590a505 Update selinux.py 
Fixed (hopefully) a couple of issues with the commit. That's what I get for parroting (and for not really knowing Python syntax yet).
 2016-11-22 16:42:22 -05:00
Erik Johnson
7c1cfa82e4 Clarify the master_type docs (#37841) 
Mention when "disable" began to be supported.
 2016-11-22 11:44:46 -07:00
Sergey Kizunov
2bc42b8484 PY3: Fix exception when handling connect exception in TCP transport (#37831) 
When `self.auth.authenticate()` would throw this exception:
`raise SaltClientError(
'Attempt to authenticate with the salt master failed with timeout error')`

The code would throw an additional exception dealing with the original
exception as follows:

```
  File "...\salt\transport\tcp.py", line 500, in connect
      if '-|RETRY|-' not in exc:
      TypeError: argument of type 'SaltClientError' is not iterable
```

And since the final exception being thrown is `TypeError` instead of
`SaltClientError`, caller code would not correctly deal with this
case and the salt-minion would terminate.

Fix this by using Python 3 friendly `str(exc)` instead of plain
`exc` when doing a string search.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-11-22 08:27:04 -07:00
Nicole Thomas
dd81d2fa67 Merge pull request #37829 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-22 08:26:00 -07:00
rallytime
3d6d32edc5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/development/contributing.rst
 2016-11-21 17:29:07 -07:00
Julien Cigar
aa3748744c add missing chloginclass (#37827) 
* add missing chloginclass

* Add versionadded tag

* Pesky whitespace fix
 2016-11-21 17:26:12 -07:00
Nicole Thomas
0e74bad284 Update branch refs to more relevant branch (#37826) 
And cleanup some :ref: links that are rendering incorrectly
 2016-11-21 16:41:02 -07:00
Nicole Thomas
6a9b49c782 Add "names" option to file state docs: point users to highstate doc examples (#37823) 
* Add "names" option to file state docs: point users to highstate doc examples

Fixes #19269

* Grammar fix
 2016-11-21 16:40:33 -07:00
Nicole Thomas
aaf587de63 Clarify keystone.user_present password state docs with default behavior (#37821) 
Fixes #15697
 2016-11-21 15:15:53 -07:00
Nicole Thomas
c300863159 Add some dependency documentation to libvirt docs (#37820) 
Fixes #5999
 2016-11-21 15:15:20 -07:00