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
67,335 Commits 24 Branches 182 Tags 341 MiB
b92e19472f
Commit Graph

67335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
1834bdefe3 Merge pull request #32531 from ticosax/support-no-volumes 
[dockerng] Fix support of dockerng.volume_present when no volume is on present.
 2016-04-13 08:42:12 -06:00
afletch
60d80c4dee Ensure rh_service not used on CloudLinux 7 
Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7
 2016-04-13 08:38:10 -06:00
Nicolas Delaby
5d73d54ed2 Enhance dockerng.wait() to control success on exit_code and on already stopped containers (#32475) 2016-04-13 08:16:26 -06:00
Bo Maryniuk
214f01e963 Bugfix: salt-key crashes if tries to generate keys to the directory w/o write access (#32436) 
* Raise an exception if keys are tried to be written to the directory that has no write access permissions

* Show an reasonable error message instead of a traceback crash.

* Fix the unit tests
 2016-04-13 08:15:37 -06:00
C. R. Oldham
17fdd7a8d4 Engines with proxies (#32508) 
* Allow engines to run with proxies.

* Propagate proxy all the way down to proc_mgr.add_process

* Lint
 2016-04-13 08:15:18 -06:00
Erik Johnson
288839f4b6 Turn on exc_info when logging failed minion startup (#32515) 2016-04-13 08:13:53 -06:00
Erik Johnson
08a80207e6 Add ignore_epoch option to pkg.installed/removed/purged states (#32520) 
This allows for the epoch to be disregarded when a version is specified.
 2016-04-13 08:11:33 -06:00
Justin Findlay
da631a3ab7 salt.version: case insensitive ordering of deps (#32532) 2016-04-13 08:01:36 -06:00
Nicolas Delaby
958b2ec749 Fix support of dockerng.volume_present when no volume is on present. 
fixes #32493
 2016-04-13 15:47:13 +02:00
Daniel Wallace
3561664891 sync engines to minions (#32507) 2016-04-12 13:17:44 -06:00
Bo Maryniuk
492ebfc184 Isbm zypper list products sles11 crash (#32505) 
* Check for EOL aggregate and fix time_t attribute

* Update SLE11 SP3 data

* Update SLE12 SP1 data

* Adjust test values according to the testing data
 2016-04-12 08:14:19 -06:00
Erik Johnson
ae89882fed Clear VCS fsbackend and git_pillar locks on master start (#32480) 
* Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks

* Clear VCS fsbackend and git_pillar locks on master start

* Fix loop in maint.flo
 2016-04-11 16:56:08 -06:00
Shane Lee
a6482a3171 Use win32api to get Total System Memory (#32491) 
Fixes: #32327
 2016-04-11 16:32:52 -06:00
Dmitry Kuzmenko
3b7ed9e8d1 Fixed message deletion from the queue for TCP. (#32486) 
There is a mistake I've made in the message deletion logic when I've
updated the message sending and timeout handling code.

Found when was porting this back into 2015.8.

Thanks to @cachedout.
 2016-04-11 16:27:29 -06:00
Nicole Thomas
538747a183 Merge pull request #32489 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-11 15:25:08 -06:00
Nicole Thomas
e335e313fe Merge pull request #32487 from terminalmage/epoch-documentation 
Add explanation of nonzero epoch requirement to pkg.installed state documentation
 2016-04-11 14:48:57 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
 2016-04-11 14:33:21 -06:00
Nicole Thomas
e8de50ff37 Merge pull request #32482 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-11 14:12:26 -06:00
Erik Johnson
e04cf879b6 Document new behavior of pkg.installed for yum/dnf packages with non-zero epoch 2016-04-11 14:42:23 -05:00
Erik Johnson
61e9761224 Add explanation of nonzero epoch requirement to pkg.installed state documentation 
Resolves #31927.
 2016-04-11 14:35:27 -05:00
Nicole Thomas
20bbabb389 Merge pull request #32484 from cachedout/issue_32479 
Only unsub if we have a jid
 2016-04-11 13:23:39 -06:00
Mike Place
9dadd74de4 Only unsub if we have a jid 
Closes #32479
 2016-04-11 12:11:13 -06:00
rallytime
1b04f0ddec Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/ref/modules/all/index.rst
  - doc/ref/modules/index.rst
  - salt/modules/systemd.py
  - salt/modules/zypper.py
 2016-04-11 11:33:08 -06:00
Neil Williamson
4372dc3816 Automatically detect correct MySQL password column for 5.7 and fix setting passwords (#32440) 
* Automatically detect MySQL password column

* Fix changing password in MySQL 5.7

* Fix lint test

* Fix unit tests (?)

They will still fail if "authentication_string" is legitimately the right column name, but I don't know what to do about that.

* Additional unit test fix
 2016-04-11 11:07:44 -06:00
Nicole Thomas
29333e533e Add documentation for some master/minion configs (#32454) 
Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal
 2016-04-11 10:49:52 -06:00
Nicole Thomas
019257931b Merge pull request #32453 from jfindlay/tmpdir 
tests.integration: fix #32447
 2016-04-11 09:40:41 -06:00
Nicole Thomas
42cb261105 Merge pull request #32476 from terminalmage/opkg-override 
Add link to provider override docs to opkg.py
 2016-04-11 09:38:35 -06:00
Erik Johnson
6f7851f8a4 Add link to provider override docs to opkg.py 
This is a companion to https://github.com/saltstack/salt/pull/32458, but
this module was not added until the 2016.3 branch, so the documentation
is being updated there for this module.
 2016-04-11 09:10:55 -05:00
Dmitry Kuzmenko
f5bd6bdcc3 Backport 31164 and 31364 (#32474) 
* Don't send REQ while another one is waiting for response.

The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.

* Fixed zeromq ReqMessageClient destroy
 2016-04-11 08:02:36 -06:00
Nicole Thomas
100c6e1b25 Merge pull request #32458 from terminalmage/clarify-providers-docs 
Improve and clarify docs on provider overrides.
 2016-04-09 08:25:42 -06:00
Erik Johnson
500d3ebbaa Add link to provider override docs to all group providers 2016-04-08 23:36:02 -05:00
Erik Johnson
83ca01f620 dd link to provider override docs to all shadow providers 2016-04-08 23:34:31 -05:00
Erik Johnson
c5fe38789d Add link to provider override docs to all user providers 2016-04-08 23:32:41 -05:00
Erik Johnson
5c1c1dda59 Add link to provider override docs to all service providers 2016-04-08 23:04:14 -05:00
Erik Johnson
736f2befc9 Add link to provider override docs to all package providers 2016-04-08 22:58:08 -05:00
Erik Johnson
f9306347cc Clarify the scope of the provider param in states. 2016-04-08 22:05:36 -05:00
Erik Johnson
af24c82ab0 Add documentation on virtual module provider overrides to the module docs 2016-04-08 22:01:14 -05:00
Erik Johnson
0bc6c97a63 Improve docstrings 2016-04-08 22:00:56 -05:00
Erik Johnson
1948920674 Add external ref to windows package manager docs 2016-04-08 22:00:06 -05:00
Erik Johnson
e7fa21438c Add new doc pages to toctree 2016-04-08 21:59:21 -05:00
Erik Johnson
f0de1236ec Move the tables of virtual modules to individual documentation pages 2016-04-08 21:58:11 -05:00
Nicole Thomas
7bf44aea72 Merge pull request #32450 from cachedout/issue_31738 
Pass parser options into batch mode
 2016-04-08 17:03:49 -06:00
Justin Findlay
117d641830 tests.integration: fix 4230c8a 2016-04-08 16:54:00 -06:00
Nicole Thomas
b29983529f Issue #28706: Fix state user.present behavior. (#32448) 
- As mentionned in issue #28706, state user.present no longer remove
      user from groups if the keyword 'groups' with empty value '[]' is not
      explicitly set, salt will assume current groups are still wanted.
 2016-04-08 16:32:26 -06:00
Justin Findlay
fa8d030ab7 tests.integration: bypass MacOS TMPDIR, gettempdir (#32447) 
Updates 0edd532, 8f558a5.

When logging in as root over `ssh root@host`, `$TMPDIR` and
`tempfile.gettempdir()` are both set to a variation of:
```
/private/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/
```
When logging in as root over `sudo -i`, `$TMPDIR` is unset and
`tempfile.gettempdir()` is set to `/tmp`.

My guess is that the second case is an unintended or uncorrected omision
by Apple as they have introduced the longer, randomized temp path in a
recent version of MacOS.
 2016-04-08 16:00:48 -06:00
Nicole Thomas
cef33d5fad Argument name in docs should match actual arg name (#32445) 
Fixes #31851
 2016-04-08 16:00:27 -06:00
Justin Anderson
116c91e293 Changed the target file in file.symlink test (#32443) 2016-04-08 16:00:15 -06:00
Mike Place
74d0fa06b4 Pass parser options into batch mode 
Resolves #31738
 2016-04-08 15:56:03 -06:00
Nicole Thomas
8d44aa3f08 Merge pull request #32429 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-08 10:56:12 -06:00
Nicole Thomas
7472141b7d Merge pull request #32437 from rallytime/pgjson_queue_docs 
Add pgjsonb_queue to queue doc index
 2016-04-08 10:14:40 -06:00