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
74,201 Commits 24 Branches 182 Tags 341 MiB
e7da7b8442
Commit Graph

74201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vitaliy Fuks
e7da7b8442 Typos are not fun! 2016-10-12 10:38:07 -06:00
Jacob Hammons
dd21da4992 Add autodoc topics for new modules added in Carbon (#36933) 
Module formatting issues
Add list of new Carbon modules to release notes
 2016-10-12 09:31:07 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
Jacob Hammons
102f909bb4 Add FreeBSD and SmartOS to RC packages list (#36916) 2016-10-11 16:30:50 -06:00
Nicole Thomas
6516059d21 Merge pull request #36917 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-11 16:15:59 -06:00
rallytime
b196c9336a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-11 13:54:09 -06:00
Jorge Schrauwen
f742e34555 smbios.get should handle missing /dev/mem to not have useless grains (#36909) 2016-10-11 13:50:56 -06:00
Nicole Thomas
b7f87e0aed Merge pull request #36915 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-11 13:49:42 -06:00
rallytime
971c27cba2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-11 13:00:17 -06:00
Erik Johnson
f3443fb992 Properly handle "shared" arg in git.init when it is a bool (#36912) 2016-10-11 12:54:15 -06:00
Joseph Hall
17253d001f Pass through port as int and not str (#36910) 2016-10-11 12:45:53 -06:00
Joseph Hall
2e3fc1e3a8 Handle missing cache data a little more gracefully (#36908) 2016-10-11 12:41:28 -06:00
Thomas S Hatch
7e2eba9cc7 Merge pull request #36776 from cro/prox_min_mgr 
Adapt MinionManager for Proxy Minions.
 2016-10-11 11:12:01 -06:00
Benoît Knecht
0ebf7a451c modules: debian_ip: override params early to fix diff (#36820) 
Slave interfaces have some of their parameters overridden before being written
to file, but when Salt is ran in test mode, those overridden values aren't
taken into account. This results in the test run showing that changes will be
applied, even though the configuration hasn't changed at all:

        ID: ens2f1
  Function: network.managed
    Result: None
   Comment: Interface ens2f1 is set to be updated:
            ---
            +++
            @@ -1,4 +1,3 @@
             auto ens2f1
            -iface ens2f1 inet manual
            -    bond-master bond0
            +iface ens2f1 inet static
   Started: 09:07:41.719716
  Duration: 1.91 ms
   Changes:

This commit overrides those values in _parse_settings_eth instead of
_write_file_ifaces, so that the test run shows what's really going to be
modified.
 2016-10-11 10:17:44 -06:00
Justin Findlay
a23ce84e57 states.schedule: splay is not ordereddict (#36894) 2016-10-11 09:03:58 -06:00
Erik Johnson
bdbf1619cb Check for test=True in salt.wait_for_event orchestration events (#36897) 
This prevents a wait_for_event from hanging the orchestration job when
test=True.
 2016-10-10 17:00:42 -06:00
Nicole Thomas
86ac8bd680 Merge pull request #36885 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-10 13:30:25 -06:00
Erik Johnson
cb92f8656a Fix traceback on "salt-ssh -h" (#36888) 
This code was originally added to the option parser in 423a356. It was
probably intended to be a single string continued onto multiple lines
via parenthesis, but the use of a comma turns this into a tuple, which
causes a traceback when "salt-ssh -h" is run.
 2016-10-10 13:30:05 -06:00
Erik Johnson
1c0ba8012c salt-ssh: Try "command -v" before falling back to "which" (#36889) 
This makes salt-ssh work better on minimal installs such as the CentOS 7
container images from linuxcontainers.org.
 2016-10-10 13:28:41 -06:00
Jacob Hammons
dff93f89ff Update list of RC build platforms, fix example (#36887) 2016-10-10 11:36:48 -06:00
Nicole Thomas
e2de78b130 Merge pull request #36884 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-10 11:22:23 -06:00
Nicole Thomas
e76f05ec48 Fix KeyError when loading runit execution module (#36882) 
Fixes #36865
 2016-10-10 10:59:35 -06:00
Nicole Thomas
3bb1bcc854 Merge pull request #36886 from rallytime/bp-36874 
Back-port #36874 to carbon
 2016-10-10 10:28:11 -06:00
m03
077645d054 Fix shell_info docstring example 2016-10-10 10:25:12 -06:00
rallytime
c09b9d6e6a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-10 10:21:04 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/beacons/index.rst
 2016-10-10 10:19:50 -06:00
Jorge Schrauwen
0b304e75a3 missing docs for salt.modules.apcups (#36863) 2016-10-08 19:51:45 -06:00
Erik Johnson
85eea4d6ee fileclient: Change queryarg comparison from None to simple boolean check (#36830) 
When there are no queryargs, the ``query`` attribute is an empty string,
not ``None``.
 2016-10-08 07:50:49 -06:00
Mike Place
9a819693ff Merge pull request #36845 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-08 14:29:10 +09:00
Mike Place
3ce4897b97 Merge pull request #36857 from terminalmage/systemd-unit-tests 
Add unit tests for systemd scope usage
 2016-10-08 14:22:05 +09:00
Erik Johnson
7c78d6f419 Add unit tests for systemd scope usage 2016-10-07 17:35:09 -05:00
rallytime
2e34277b65 Add '--no-psqlrc' option to new-to-carbon postgres unit test 2016-10-07 16:10:57 -06:00
Nicole Thomas
6a6bdf3e3f Merge pull request #36853 from rallytime/bp-33939 
Back-port #33939 to 2016.3
 2016-10-07 15:44:32 -06:00
Nicole Thomas
0d78c70a30 Merge pull request #36850 from rallytime/bp-36736 
Back-port #36736 to carbon
 2016-10-07 15:44:18 -06:00
Nicole Thomas
01348bde18 Merge pull request #36852 from rallytime/bp-36743 
Back-port #36743 to 2016.3
 2016-10-07 15:35:43 -06:00
Bartosz Burclaf
efbc09c1a6 Removed !-password check 2016-10-07 13:57:18 -06:00
Jacob Hammons
d179423a23 Doc updates for Carbon release candidate (#36847) 2016-10-07 13:50:03 -06:00
do3meli
899130d11f corrected OS Name in module load error message 2016-10-07 13:40:00 -06:00
m03
b7f5f82cf6 Fix issue 36679 win_servermanager failure 2016-10-07 13:25:55 -06:00
rallytime
af044fd889 Pylint fix 2016-10-07 13:22:02 -06:00
Nicole Thomas
0b7661244d Merge pull request #36844 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-07 13:20:31 -06:00
C. R. Oldham
dc5d821be6 Merge pull request #36835 from jfindlay/beacon_doc 
unify and expand beacon documentation
 2016-10-07 09:59:34 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
rallytime
1c3a9a3ee9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/minion.py
  - salt/output/highstate.py
 2016-10-07 09:39:48 -06:00
Justin Findlay
b2eccdefd5 doc.topics.beacons: reflow text at 80 chars 2016-10-06 17:06:10 -06:00
Justin Findlay
b181f9890d doc.topics.{reactor|beacons}: unify examples, many minor edits 2016-10-06 17:06:10 -06:00
Justin Findlay
28b4e30009 doc.glossary: use parenthesis 2016-10-06 16:17:22 -06:00
Justin Findlay
82cf39db00 doc.glossary: add JID 2016-10-06 16:17:22 -06:00
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -06:00
C. R. Oldham
0df63da0ae Refactor repeat of _spawn_minions 2016-10-06 14:20:29 -06:00