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

74534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pablo Suárez Hernández
330f830c9b Disables 'novendorchange' for old SLEs versions 2016-10-20 12:15:10 +01:00
Mike Place
2f25b4f81d Merge pull request #37111 from saltstack/revert-36952-bp-36875 
Revert "Back-port #36875 to carbon"
 2016-10-20 19:50:03 +09:00
Mike Place
3179303a5d Revert "Back-port #36875 to carbon" 2016-10-20 19:49:45 +09:00
Pablo Suárez Hernández
01b0a6917c Minor pylint fixes 2016-10-20 11:33:11 +01:00
Pablo Suárez Hernández
7dbb0bd252 Unit tests fixes 2016-10-20 10:59:48 +01:00
Pablo Suárez Hernández
e89982b6d2 Improves 'dryrun' outputting. Setting 'novendorchange' as not supported for SLE11 2016-10-20 10:24:21 +01:00
Pablo Suárez Hernández
c5a34cbadf Adds multiple repositories support to 'fromrepo' parameter 2016-10-20 10:19:17 +01:00
Denys Havrysh
cfc3a0ed92 pkgbuild.repo: add timeout parameter for waiting passphrase prompt 2016-10-20 11:51:58 +03:00
Mike Place
0b87e7890a Merge pull request #37103 from cachedout/fix_proc_test 
Remove unnecessary sleep from unit.utils.process_test.TestProcessMana…
 2016-10-20 17:45:07 +09:00
Mike Place
326bbd5e30 Merge pull request #36823 from terminalmage/pr-36806 
Update debian systemd unit files to use default KillMode, Type=notify
 2016-10-20 14:54:42 +09:00
Mike Place
0c40e71e17 Merge pull request #37030 from isbm/isbm-solaris-status-fix 
Fix status.uptime for Solaris 9, 10 and 11.
 2016-10-20 14:52:53 +09:00
Mike Place
38fdd28962 Merge pull request #37087 from vutny/gpg-fix-short-keyid 
salt.modules.gpg: allow getting keys by short key ID
 2016-10-20 14:49:32 +09:00
Mike Place
3a37a22366 Merge pull request #37088 from meaksh/zypper-distupgrade-support-2015.8 
Adding 'dist-upgrade' support to the zypper module
 2016-10-20 14:46:56 +09:00
Mike Place
2f29e9e956 Merge pull request #37090 from zer0def/silence-prereq-supervisord-warnings 
Silence warnings about "__prerequired__" being an invalid kwarg when using `prereq` with supervisord states.
 2016-10-20 14:46:17 +09:00
Mike Place
f26475753e Merge pull request #37100 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-20 14:40:00 +09:00
Mike Place
eb88c73222 Merge pull request #37101 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2016.3 to carbon
 2016-10-20 14:39:24 +09:00
Mike Place
d7aebd1877
Remove unnecessary sleep from unit.utils.process_test.TestProcessManager.test_restarting 2016-10-20 14:29:10 +09:00
rallytime
b445a5e579 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-10-19 18:24:04 -06:00
rallytime
a7dda5706e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/win_service.py
  - salt/modules/x509.py
  - salt/utils/__init__.py
  - tests/unit/modules/win_service_test.py
 2016-10-19 18:20:04 -06:00
Erik Johnson
68eeb29783 Add warning about GitPython 2.0.9 incompatibility with Python 2.6 (#37099) 2016-10-19 18:06:07 -06:00
Erik Johnson
fb6e545f78 Use NotifyAccess=all in all unit files 
When systemd-python is not installed, systemd notification falls back to
using the systemd-notify for service notification. This cannot be used
however unless the unit has NotifyAccess=all set.

The particular use case for this is when Salt is installed using pip. We
don't put systemd-python into the requirements.txt because we can't be
sure that the minion supports systemd, so pip installs won't necessarily
have systemd-python available.
 2016-10-19 12:50:30 -05:00
Erik Johnson
8d44efed78 Merge pull request #36958 from twangboy/fix_cmd_powershell 
Fix bug where cmd.powershell fails to return
 2016-10-19 11:03:58 -05:00
Thomas S Hatch
beb54b3ffa Merge pull request #37086 from cachedout/mm_req 
Make salt-call a first-class citizen for multi-master
 2016-10-19 09:19:08 -06:00
Pablo Suárez Hernández
c0641a4027 Fix in log message 2016-10-19 15:12:08 +01:00
Pablo Suárez Hernández
a092a974da Refactor: Cleanup and pylint fixes 2016-10-19 14:57:03 +01:00
zer0def
6a4bfbb485 Silence warnings about "__prerequired__" being an invalid kwarg when using prereq. (no refs) 2016-10-19 14:56:55 +02:00
rajvidhimar
97fb627dab changed the way filter is taken for get-config and changed state file to reflect change of call_rpc to rpc 2016-10-19 18:09:09 +05:30
Pablo Suárez Hernández
1331ae5c72 Unit tests for zypper upgrade and dist-upgrade 2016-10-19 13:21:55 +01:00
Bo Maryniuk
7d7b5ef9a9 Lintfix: E8303 too many blank lines 2016-10-19 13:56:31 +02:00
Pablo Suárez Hernández
4bcfef2ba2 Adding 'dist-upgrade' support to zypper module 2016-10-19 12:46:20 +01:00
rajvidhimar
65529d1f35 Changed the name of call_rpc to rpc and changed the way rpc call is made 2016-10-19 16:07:27 +05:30
Denys Havrysh
c589cba8a9 salt.modules.gpg: allow getting keys by short key ID 2016-10-19 13:31:15 +03:00
Mike Place
7dc15c1a48
Lint utils 2016-10-19 16:45:54 +09:00
Mike Place
9bbe3c998b
Lint error in publish 2016-10-19 16:45:08 +09:00
Mike Place
e22a3d2be6
Add multi-master support to publish.publish 2016-10-19 16:42:32 +09:00
Mike Place
7f141ba38c
Add function to search for substr in list 2016-10-19 15:55:02 +09:00
Mike Place
007eef84d7
Extend support to event.fire_master 2016-10-19 15:42:50 +09:00
Mike Place
8171c73b00
Multi-master support for salt-call 2016-10-19 15:38:01 +09:00
Mike Place
39d59ab0df Merge pull request #36880 from vutny/cp-get-salt-url 
cp.get_url: fix `dest=None` behaviour with `salt://` URL
 2016-10-19 12:10:45 +09:00
Mike Place
6b94153ea6 Merge pull request #36898 from clinta/x509-fixes 
X509 fixes
 2016-10-19 12:03:43 +09:00
Mike Place
a32b8cd741 Merge pull request #37025 from cro/freebsd_no_proc 
Make salt.utils.minion._check_cmdline work on OSes without /proc.
 2016-10-19 12:00:10 +09:00
Mike Place
e09d9f85c5 Merge pull request #37050 from twangboy/fix_win_service_state 
Fix service state for Windows (DO NOT MERGE FORWARD)
 2016-10-19 11:46:27 +09:00
Mike Place
5e998638a4 Merge pull request #37076 from jfindlay/proxy_doc 
Document proxy settings
 2016-10-19 11:30:27 +09:00
Mike Place
9ec366833e Merge pull request #37081 from terminalmage/issue37001 
Fix archive.extracted remote source_hash verification
 2016-10-19 11:22:22 +09:00
Mike Place
67faee1f94 Merge pull request #37064 from cachedout/issue_35097 
Unify job check in scheduler
 2016-10-19 11:08:05 +09:00
Erik Johnson
a3c4deeb82 Fix archive.extracted remote source_hash verification 
When ``file.managed`` is invoked within an archive.extracted state to
pull down the source archive, ``file.extract_hash`` is invoked with
the unique name we created for it, rather than the actual source
filename. This causes hash extraction to fail, or only return a partial
match. Either of these cases causes the ``archive.extracted`` state to
fail.

This commit adds a new optional kwarg to ``file.get_managed`` which can
be used to override which filename we pass to ``file.extract_hash``, and
then passes this kwarg to the ``file.managed`` we invoke from within the
``archive.extracted`` state.
 2016-10-18 16:08:34 -05:00
rajvidhimar
2fef4b6504 Allow junos versions older than 14.2 to run junos.call_rpc. Fix version_info in junos grains 2016-10-19 00:48:08 +05:30
Justin Findlay
7328df68f5 doc.topic.tutorials.http.query: add proxy section 2016-10-18 10:50:37 -06:00
Justin Findlay
331072b35d doc.topic.tutorials.http.query: add subheadings 2016-10-18 10:50:37 -06:00
Justin Findlay
478def4923 doc.ref.configuration.minion: add proxy vars 2016-10-18 10:50:37 -06:00