valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,346 Commits 24 Branches 182 Tags 341 MiB
7f968ddb72
Commit Graph

74346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Walton
51230fc263 Merge pull request #1 from rallytime/pr-36241 
Update mocks for failing tests in win_certutil_test
 2016-10-12 18:15:02 -04:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
Nicole Thomas
6714da714e Merge pull request #36952 from rallytime/bp-36875 
Back-port #36875 to carbon
 2016-10-12 15:03:42 -06:00
Nicole Thomas
c1f84388d6 Merge pull request #36950 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-12 14:57:41 -06:00
Denys Havrysh
e2bc94b029 cp.get_file_str: do not fail if file not found (#36936) 2016-10-12 13:40:49 -06:00
rallytime
1d3ce45ac0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-12 13:30:09 -06:00
Andrew Pashkin
337119c113 Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running 2016-10-12 13:21:40 -06:00
Andrew Pashkin
27bc7aad91 Add Visual Studio Code related directory .vscode/ to .gitignore 2016-10-12 13:21:40 -06:00
C. R. Oldham
2ccc44f314 Merge pull request #36914 from rallytime/suse_show_link 
Allow alternatives.show_link function to work on Suse distros
 2016-10-12 13:09:33 -06:00
rallytime
5362e5183e Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/cli/index.rst
 2016-10-12 12:36:00 -06:00
Nicole Thomas
7e2128c05d Merge pull request #36948 from rallytime/bp-36943 
Back-port #36943 to 2016.3
 2016-10-12 12:33:02 -06:00
Nicole Thomas
ab1ded3da4 Merge pull request #36947 from rallytime/bp-36901 
Back-port #36901 to carbon
 2016-10-12 12:32:50 -06:00
Nicole Thomas
f43a10252d Merge pull request #36946 from rallytime/bp-36892 
Back-port #36892 to 2016.3
 2016-10-12 12:32:35 -06:00
Nicole Thomas
5c70669ac0 Merge pull request #36945 from rallytime/bp-35199 
Back-port #35199 to 2016.3
 2016-10-12 12:31:15 -06:00
rallytime
32846794c8 Update mocks for failing tests in win_certutil_test 2016-10-12 11:31:58 -06:00
Denys Havrysh
fe2f094838 salt.modules.gpg: initialize GnuPG home dir with correct ownership (#36824) 
* salt.modules.gpg: fix files ownership when writing to GnuPG home dir

* salt.modules.gpg: fix docstrings when using decorator
 2016-10-12 11:13:27 -06:00
Erik Johnson
7565ed662a Fix versionadded (#36949) 
Since this was merged a couple weeks ago and we have yet to cut
v2016.3.4, this code will be in 2016.3.4, not 2016.3.5.
 2016-10-12 11:05:07 -06:00
Mate Ory
d2f8f18430 doc: document what the argument of salt --subset means 2016-10-12 10:42:31 -06:00
Vitaliy Fuks
e7da7b8442 Typos are not fun! 2016-10-12 10:38:07 -06:00
Michał Sochoń
94c97ee726 Update tutorial.rst 
Fix error in the list.
 2016-10-12 10:34:28 -06:00
Justin Zandbergen
390b906c2f adhere pep8 e713 2016-10-12 10:33:16 -06:00
Justin Zandbergen
79c9905fc5 Re-added accidentally removed line 85 2016-10-12 10:33:16 -06:00
Justin Zandbergen
8bba13896a Fixed issue #35198 now without deprecated code. 2016-10-12 10:33:16 -06:00
Justin Zandbergen
1241d87f1d fix for issue #35198 2016-10-12 10:33:16 -06:00
Justin Findlay
4d8fb03b79 return opennebula errors to user (#36930) 
* cloud.clouds.opennebula: return errors to user

* cloud.clouds.opennebula._get_xml: add unit test
 2016-10-12 10:19:11 -06:00
Erik Johnson
4b21cca909 Fix race condition in which files were removed during a file.directory (#36928) 
This resolves a case in which a directory being managed by a
file.directory state was running a sphinx build, and temporary
files/dirs created by the build were present when the initial walk was
performed but were cleaned up by the time the state got around to
enforcing permissions.
 2016-10-12 09:56:53 -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
C. R. Oldham
6ea1f59058 Merge pull request #36929 from rallytime/fix-pending-upgrade-test 
[yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades
 2016-10-11 16:55:49 -06:00
rallytime
32829b9474 [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades 
yumpkg.list_upgrades returns an empty dictionary when no upgrades are available.
We need to check for this situation and skip the test if no upgrades are present.

Fixes the test failure on Fedora 24 on Jenkins currently, but also protects against
any potential failures for other RHEL-based distros that aren't currently failing
because "ret" is populated with a dictionary of upgrades.
 2016-10-11 16:50:50 -06:00
Nicole Thomas
288f437d5e [2016.3] Remove "Targeting with Executions" section from docs (#36926) 
The targeting docs were refactored in the 2016.3 branch compared to
the 2015.8 branch. This fixes #36906 for the 2016.3 branch and newer.

Refs #36925
 2016-10-11 16:34:08 -06:00
Nicole Thomas
7838d8d3f9 Remove "Targeting with Executions" section from docs (#36925) 
This feature was removed long ago and is no longer under development.

Fixes #36906
 2016-10-11 16:33:56 -06:00
Erik Johnson
a56bf8bd2d Update references to future default value change that was reverted (#36924) 2016-10-11 16:33:41 -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
rallytime
b8ffd9f53f Allow alternatives.show_link function to work on Suse distros 
This should fixup the failing integration.states.alternatives test
in 2016.3 as well. The alternatives.install state relies on checking
if the output of alternatives.show_link matches the path passed into
the state. Since show_link didn't work on suse correctly, the state
doesn't install the alternative and returns False.
 2016-10-11 12:46:31 -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
Daniel Wallace
727d4f309a allow for closing stuff in beacons 
Like the filehandler for inotify
 2016-10-11 12:34:42 -05: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
Clint Armstrong
eb4433d1ae return early if there are no requested extensions in the csr 2016-10-11 07:50:46 -04: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
Clint Armstrong
d00cf8ef87 allow specifying digest for crl 2016-10-10 16:57:08 -04:00