valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,267 Commits 24 Branches 182 Tags 341 MiB
4f03f2311f
Commit Graph

67267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Nicole Thomas
a36f9499fc Merge pull request #32432 from ticosax/fix-domainname-introspection 
[dockerng] Fix Domainname introspection
 2016-04-08 10:12:19 -06:00
rallytime
5a641ddc2a Pylint fixes 2016-04-08 09:56:03 -06:00
Nicole Thomas
def911974c Merge pull request #32427 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-08 09:39:13 -06:00
rallytime
1fa7c021b3 Add pgjsonb_queue to queue doc index 2016-04-08 09:08:17 -06:00
Nicolas Delaby
505b5b0168 Fix Domainname introspection 
Default value needs to be extracted from the container itself,
because dockerd set Domainname value when network_mode=host.
 2016-04-08 11:02:05 +02:00
rallytime
59b804d230 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/pkgng.py
  - salt/modules/status.py
  - salt/states/boto_asg.py
  - salt/states/boto_elb.py
 2016-04-07 16:28:59 -06:00
Nicole Thomas
c712fbed37 Merge pull request #32419 from jtand/file_state_test_fix 
Fixes test failure where Fedora 23 has /etc/grub.conf by default
 2016-04-07 16:15:51 -06:00
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
 2016-04-07 16:10:32 -06:00
Nicole Thomas
5bc8c326ce Merge pull request #32423 from jtand/glusterfs_test_fix 
Update glusterfs_test to be inline with #32312
 2016-04-07 15:53:03 -06:00
Nicole Thomas
c07e02bacb Merge pull request #32425 from cachedout/issue_31632 
Fix salt-cloud paralell provisioning
 2016-04-07 15:52:06 -06:00
Nicole Thomas
0809126d8e Merge #32293 with test fixes (#32418) 
* Fix issue #11497

* Remove check for working directory presence in tests
 2016-04-07 14:55:25 -06:00
Erik Johnson
bbd8260a42 Ignore Raspbian in service.py __virtual__ (#32421) 
* Ignore Raspbian in service.py __virtual__

This prevents more than one execution module from trying to load as the
service virtual module.

Refs: #32413

* pack __salt__ before loading provider overrides

We can (and should) pack here since we're just packing a reference to the
object. __salt__ needs to be available when we're loading our provider
overrides

* Fix broken __salt__ dict in provider override

Using ret.items() here sets ``__salt__`` to its items (tuple containing
function name and reference), breaking usage of ``__salt__`` inside
overridden functions.
 2016-04-07 14:54:38 -06:00
Mike Place
127c0829ee Fix salt-cloud paralell provisioning 
Closes #31632
 2016-04-07 14:50:35 -06:00
Justin Anderson
6f98bd50eb Update glusterfs_test to be inline with #32312 2016-04-07 14:38:21 -06:00
Justin Anderson
28ea60f28e Fixes test failure where Fedora 23 has /etc/grub.conf by default 2016-04-07 11:40:12 -06:00
Erik Johnson
005825a30e Merge pull request #32416 from jtand/salt_spec_fix 
Updated salt.spec bash_completion
 2016-04-07 11:17:19 -05:00
Justin Findlay
b27ccc424b update release candidate testing doc (#32414) 2016-04-07 09:41:46 -06:00
Justin Anderson
65614b7f0f Updated salt.spec bash_completion 2016-04-07 09:16:47 -06:00