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
50,784 Commits 24 Branches 182 Tags 341 MiB
638ccf501d
Commit Graph

50784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
638ccf501d Work around upstream cherrypy bug 
Refs https://github.com/cherrypy/cherrypy/issues/1444
 2016-06-09 09:09:10 -06:00
Mike Place
cdda593c50 Merge pull request #33829 from terminalmage/update-versionchanged 
Update versionchanged directive
 2016-06-08 06:45:45 -07:00
Mike Place
b8e6c144d8 Merge pull request #33833 from terminalmage/issue33645 
Support syncing pillar modules to masterless minions
 2016-06-08 06:43:16 -07:00
Erik Johnson
91745c2a67 Support syncing pillar modules to masterless minions 
Resolves #33645.
 2016-06-07 13:50:48 -05:00
Erik Johnson
f7028eb1c6 Update versionchanged directive 
This change did not make it into 2015.5.11, and it is not certain at
this time whether or not we will do a 2015.5.12.
 2016-06-07 12:26:02 -05:00
Mike Place
e061788e81 Merge pull request #33814 from terminalmage/archive-extracted-xz 
Support extraction of XZ archives in archive.extracted state
 2016-06-07 07:36:48 -07:00
Erik Johnson
897a716df2 Support extraction of XZ archives in archive.extracted state 
Using an XZ-compressed archive with archive.extracted raises a
tarfile.ReadError exception, as only gzip and bzip2 are supported by
tarfile. This commit catches that exception and attempts to extract
using xz-utils, if present.

It also makes some clarifications and corrections to the documentation.
 2016-06-07 02:07:30 -05:00
Mike Place
fa983e91cf Merge pull request #33778 from sodium-chloride/2015.5-2016-0604-1938 
Fix minor docstring issues
 2016-06-06 03:44:16 -07:00
Jεan Sacren
a5fb6d7a69 Fix minor docstring issues 
The network.get_bufsize function requires an interface for arg. In the
example, the argument is missing and the function name is a little bit
off. Add arbitrary 'eth0' for argument and correct the name.
 2016-06-04 19:41:36 -06:00
Mike Place
b9133326c8 Merge pull request #33726 from jtand/sysmod_skip_valid_docs_glance 
glance.warn_until shouldn't be checked for a doc string
 2016-06-03 09:06:08 -07:00
Justin Anderson
ebee8a89af glance.warn_until shouldn't be checked for a doc string 2016-06-02 16:30:36 -06:00
Mike Place
137f0b19f3 Merge pull request #33611 from TargetHolding/2015.5 
2015.5
 2016-06-02 12:32:58 -07:00
Rolf Fokkens
1dd15a603b solve' TypeError: expected string or buffer' in json/decoder.py 2016-05-29 16:08:48 +02:00
Rolf Fokkens
eaf42ca892 solve AttributeError: 'module' object has no attribute 'exception' 2016-05-29 16:06:59 +02:00
Mike Place
6f7fda0354 Merge pull request #33486 from jtand/2015.5 
Add docstring examples to glance.py [2015.5]
 2016-05-25 10:21:22 -07:00
Mike Place
f72ec1479b Merge pull request #33482 from rallytime/pillar-opts-docs 
Add pillar_opts docs to master.rst
 2016-05-25 09:39:25 -07:00
Justin Anderson
d1e210fff8 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2016-05-25 10:28:18 -06:00
Mike Place
dc644b145d Merge pull request #33488 from rallytime/fix-18752 
Add docs for the syndic_finger config
 2016-05-25 08:23:10 -07:00
rallytime
b0a9f4181f Add docs for the syndic_finger config 
Fixes #18752
 2016-05-24 16:10:43 -06:00
Justin Anderson
ee2ae0ea8a Added docstring examples to glance.image_schema and schema_get 2016-05-24 15:16:07 -06:00
Justin Anderson
59e90064e6 modules.swift.head does not have a body. Should not be checked for a docstring right now. 2016-05-24 14:58:32 -06:00
rallytime
087564528d Add pillar_opts docs to master.rst 2016-05-24 13:26:24 -06:00
Mike Place
a4e84aa7d2 Merge pull request #33454 from scubahub/2015.5 
Correct (and make consistent) determination of the test flag.
 2016-05-24 09:12:57 -07:00
Daniel Wallace
3a52ace673 manage account information for pam (#33473) 
Make sure to run the account sections of pam.d directives.

Closes #32455
 2016-05-24 09:05:39 -07:00
Oscar Steele
df3c0b8e78 Correct (and make consistent) determination of the test flag. 
Fixes: #33363
 2016-05-23 14:45:26 -07:00
Justin Findlay
2cc650965a update 2015.5.11 release notes (#33412) 2016-05-20 15:08:35 -06:00
Nicole Thomas
dc8ce2d8b1 Fix traceback in logging for config validation (#33386) (#33405) 2016-05-20 13:48:15 -07:00
Thomas S Hatch
d15f5e2cef Merge pull request #33383 from thatch45/2015.5 
maintain the fallabck because I am totally sick of this crap
 2016-05-19 18:03:59 -06:00
Thomas S Hatch
f5ebcba21c restore whitespace 2016-05-19 17:01:19 -06:00
Thomas S Hatch
1d8b289db1 blast, put the try/except int he right place 2016-05-19 17:00:16 -06:00
Thomas S Hatch
081e6c5b83 maintain the fallabck because I am totally sick of this crap 2016-05-19 16:33:15 -06:00
Mike Place
755acfb97e Improve doc clarity for disable_modules documentation (#33379) 
* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name
 2016-05-19 16:31:41 -06:00
Mike Place
2b5ad128bf Better YAML syntax error handling (#33375) 
Closes #26574
 2016-05-19 15:56:45 -06:00
jacobhammons
bb3e98cad2 Merge pull request #33372 from jacobhammons/release-update 
revved 2015.8 branch to .9 in version selector
 2016-05-19 14:05:35 -06:00
Jacob Hammons
5ce502160b revved 2015.8 branch to .9 in version selector 2016-05-19 14:04:26 -06:00
phistrom
55be0abf4d Expanded documentation for boto_elb state and module (#33341) 
* Describes what happens when the CNAME parameter is given.

* Describes what the recognized attributes are for for ELBs.
 2016-05-18 19:02:20 -06:00
Nicole Thomas
9b42a05519 Added some more docs for master and minion config settings (#33292) 
* Added some more docs for master and minion config settings

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size

* Change "sub minion" to "sub-minion"
 2016-05-17 09:58:20 -07:00
gerhardqux
8acee5e06c Fix iptables --match-set (#23643) (#33301) 
Function is expecting two arguments. But after processing state only one
parameter (it contain two words) is pushed into list of options.
This patch reverts the parsing of "iptables --match-set" to the behaviour
of salt v2014.*.

This is a backport of https://github.com/saltstack/salt/pull/28325

Closes #23643
 2016-05-17 10:24:14 -06:00
David Boucha
757ef20a31 fix "loose" typo (#33290) 2016-05-16 17:13:40 -06:00
Nicole Thomas
b7d98da64d Add auth_tries config option to minion.rst docs (#33287) 2016-05-16 14:17:19 -07:00
Nicole Thomas
061851bcbf Document minion_id_caching config value (#33282) 
Fixes #33276
 2016-05-16 13:12:38 -07:00
Loren Gordon
8fa72f6588 Clarify file.replace MULTILINE flag interaction with regex anchors (#33137) 
Fixes #33118
 2016-05-13 15:39:06 -06:00
Justin Findlay
4b1f460256 update 2015.5.11 release notes (#33236) 2016-05-13 08:30:59 -06:00
Thomas S Hatch
698f1eb657 Merge pull request #33211 from cachedout/user_kill 
Don't try to kill a parent proc if we can't
 2016-05-12 15:29:50 -06:00
Mike Place
d4f2e5baa7 Don't try to kill a parent proc if we can't 2016-05-12 14:02:00 -06:00
Mike Place
f86832911e Resolve issue with pkg module on Mint Linux (#33205) 
Closes #32198
 2016-05-12 12:23:34 -06:00
Justin Anderson
a09e1b6335 Add pip installed and removed test (#33178) 2016-05-12 08:31:41 -07:00
Justin Findlay
96e3586f12 update 2015.5.11 release notes (#33197) 2016-05-12 04:54:40 -06:00
Shane Lee
09b072a412 Fix file.managed for Windows (#33181) 
* Revert back to import string_types

For some reason, there is a problem with the following
code when run from the file.py module:
```
from salt.ext import six
comment = 'This is a string'
isinstance(comment, six.string_types)
```
When run from within the python shell it works fine.

* Add six import

* Fix some lint

* Use correct six import

* Changed it back to explicit import

* Additional comments specific to 2015.5

* Fix file.managed for real

* Move comment to clarify purpose
 2016-05-11 17:59:05 -06:00
Nicole Thomas
30868ab06c [2015.5] Update to latest bootstrap script v2016.05.11 (#33185) 2016-05-11 14:41:53 -06:00