valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,314 Commits 24 Branches 182 Tags 341 MiB
e38db3985b
Commit Graph

76314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Boughton
ddc238df36 Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode 2016-11-27 08:40:05 -05:00
Daniel Boughton
ef75c459c0 Merge branch '2016.3' of github.com:saltstack/salt into fix-augeas-return-for-test 2016-11-27 08:38:23 -05:00
Vincas Dargis
072a319490 Fix server trust in test run of svn.latest 
Add missing --trust-server-cert option while running svn.latest in test=True mode
 2016-11-27 15:29:16 +02:00
Mike Place
f912b8cd02 Merge pull request #37880 from alexbleotu/vmware_connection_common_functions-gh 
Vmware connection common functions gh
 2016-11-27 12:55:34 +02:00
Mike Place
468dea6c42 Merge pull request #37858 from cournape/installers/osx/support-maverick 
FEAT: put back support for Maverick in OS X installer.
 2016-11-27 12:54:05 +02:00
Mike Place
ab733dbf20 Merge pull request #37883 from s0undt3ch/develop 
Make `terminate_process_pid` match latest form salt-testing.
 2016-11-27 12:50:44 +02:00
Mike Place
f39fdf443f Merge pull request #37896 from toanju/2016.3 
rh networking: add missing values
 2016-11-27 12:30:35 +02:00
Erik Johnson
efb4dc1001 Add states to manage systemd masking 
This also changes how the systemd module handles masking, to accommodate
the fact that both indefinite and runtime masks can be set
simultaneously for the same service.
 2016-11-27 01:06:33 -06:00
Erik Johnson
d8507384e2 Squelch warning for config value that can be either a dict or None 2016-11-26 16:31:40 -06:00
Erik Johnson
941fb8aa8b Merge pull request #37902 from gtmanfred/develop 
use opts for metadata grains
 2016-11-26 16:13:45 -06:00
Daniel Wallace
84c57ba761 use opts for metadata grains 
I checked for them, but apparently we manually load the cmdmod stuff for
the core grains, so __salt__ is not loaded in metadata grain.  This just
means that this setting will have to be put in the minion config to
enable it.
 2016-11-26 16:10:39 -06:00
Tobias Jungel
c95304188e rh networking: add missing values 
this patch enables configuration of NETWORKDELAY= and DEVTIMEOUT= in
/etc/sysconfig/network
 2016-11-25 21:29:22 +01:00
Daniel Boughton
b0fe0cd256 Change return value for salt/states/augeas.py to be True instead of None for cases where salt is run with test=True. Fixes #37870 2016-11-25 14:14:29 -05:00
Bruno Binet
7fceaa3476 Fix support for extra_mods='six' to add six module to a thin.tgz tarball 
Without this patch, gen_thin will only include py2/salt/ext/six.py
but not py2/six.py (which may be required for other selected extra_mods
python modules)
 2016-11-25 11:27:31 +01:00
Mike Place
ea935c5a91 Merge pull request #37886 from bdrung/fix-typos 
Fix various spelling mistakes
 2016-11-25 04:59:36 +02:00
Bo Maryniuk
91b42578b2 Add overwrite option so the extraction of the archive can be always performed. 2016-11-24 19:06:20 +01:00
Bo Maryniuk
e6958f7f15 Remove nonsense comment and react on generally absent path name 2016-11-24 18:27:53 +01:00
Rudy Attias
166c42bc51 fix boto_rds.describe 2016-11-24 18:03:04 +02:00
Benjamin Drung
9a51ba5c5b Fix various spelling mistakes 2016-11-24 16:00:31 +01:00
David Cournapeau
dcc52ba08a BUG: fix copypasta in preinstall script. 2016-11-24 14:53:04 +00:00
David Cournapeau
6c55e1e7fa Revert "REF: use a variable to reference the pre/post install script output on OS X installer." 
This reverts commit 7180e5ec21.
 2016-11-24 14:52:03 +00:00
Mircea Ulinic
30b234f697
Import salt.utils.network 2016-11-24 14:08:35 +00:00
Rudy Attias
ddd88ba047 fix boto_rds.describe parameters and subnetgroup_present 2016-11-24 15:23:36 +02:00
Pedro Algarvio
cbcd4ce123
Make terminate_process_pid match latest form salt-testing. 
Namely https://github.com/saltstack/salt-testing/commit/094d00784812
 2016-11-24 13:19:56 +00:00
Mircea Ulinic
8cdceebb34
Do not change previous behaviour 2016-11-24 12:35:18 +00:00
Rudy Attias
bfe7f92cb4 fix missing tags in call to boto_rds.exists 
which caused a shift of parameters (keyid=profile)
 2016-11-24 13:50:58 +02:00
Alexandru Bleotu
39fe0b41b6 Added/updated tests for exception handling/get_root_folder change in utils.vmware.get_content 2016-11-24 05:53:51 -05:00
Mike Place
371b0a86d9 Merge pull request #37736 from dhaines/issue-37732 
handle semodule version >=2.4 (#37732) and fix typo
 2016-11-24 03:44:20 +02:00
Mike Place
87aeb66fbf Merge pull request #37797 from clan/extfs 
check count of columns after split
 2016-11-24 03:28:59 +02:00
Mike Place
f7c7109152 Merge pull request #37762 from twangboy/fix_chocolatey_state 
Add pre_versions to chocolatey.installed
 2016-11-24 03:27:29 +02:00
Mike Place
843ceac997 Merge pull request #37862 from cloudflare/LOAD-TPL-2016.11.1 
[2016.11.1] Docstring fixes and new features for napalm_network
 2016-11-24 03:00:38 +02:00
Mike Place
b9b57973b7 Merge pull request #37873 from twangboy/dsc_config_data 
Dsc config data
 2016-11-24 02:50:05 +02:00
Mike Place
8c20b62a2e Merge pull request #37874 from skizunov/develop2 
Make build_pkg.bat work with Python 3.6/3.5/2.7
 2016-11-24 02:49:20 +02:00
Nicole Thomas
56baa92d55 Merge pull request #37866 from meaksh/2016.3-bp-37149-36938-36784 
Backport #37149 #36938 and #36784 to 2016.3
 2016-11-23 14:54:17 -07:00
Eric Radman
3f2e13d1fc Remove repeated words in docs (#37871) 
Found using

find . -name '*.rst' | xargs igor -R -r
 2016-11-23 14:53:17 -07:00
Sergey Kizunov
334535bbd3 Make build_pkg.bat work with Python 3.6/3.5/2.7 
Make `build_pkg.bat` and associated utility `portable.py`
compatible with Python 3.6, 3.5, and 2.7.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-11-23 14:24:55 -06:00
twangboy
fe3280b901 Change to config_name, add versionadded 2016-11-23 12:59:20 -07:00
twangboy
dba72d91ba Improve top documentation, standardize PowerShell 2016-11-23 12:50:00 -07:00
twangboy
fefd100d08 Additional docs formatting 2016-11-23 12:30:05 -07:00
Bo Maryniuk
91ed307af9 Sanitise input for the keys and IDs 2016-11-23 19:30:54 +01:00
Bo Maryniuk
86623f913d Add a stub for ID sanitiser (at the moment same as hostname) 2016-11-23 19:30:47 +01:00
Bo Maryniuk
637144c841 Rename "general.py" to "sanitisers.py" 2016-11-23 19:30:37 +01:00
Bo Maryniuk
f2571fc8bf Add hostname sanitiser 2016-11-23 19:30:29 +01:00
Bo Maryniuk
3ae086aff4 Add filename sanitiser 2016-11-23 19:30:22 +01:00
Bo Maryniuk
816b1d1977 Add general sanitisers 2016-11-23 19:30:10 +01:00
twangboy
c32401630b Add config_data and parameters 
Fix docs formatting
 2016-11-23 11:22:38 -07:00
Bo Maryniuk
038374a586 Do not include "gpg-pubkey" packages, filtering by their name 2016-11-23 18:35:43 +01:00
Nicole Thomas
d0cc7f0d56 Merge pull request #37863 from rallytime/bp-36893 
Back-port #36893 to 2016.3
 2016-11-23 10:09:09 -07:00
Mihai Dinca
9d8d578109 Fix pkg.latest_version when latest already installed 2016-11-23 17:02:40 +00:00
Joerg Reuter
ffca0d491c - acl.delfacl: fix position of -X option to setfacl 2016-11-23 17:02:32 +00:00