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
75,168 Commits 24 Branches 182 Tags 341 MiB
9e206b67fa
Commit Graph

75168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7dbee2d599 Merge pull request #37102 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-20 14:39:15 +09:00
Mike Place
d7aebd1877
Remove unnecessary sleep from unit.utils.process_test.TestProcessManager.test_restarting 2016-10-20 14:29:10 +09:00
Fake-Name
7b62b12203 Clearer check. 2016-10-19 18:29:54 -07:00
rallytime
4731e2d1b1 Merge branch 'carbon' into 'develop' 
Conflicts
  - salt/modules/file.py
  - salt/utils/files.py
 2016-10-19 18:28:43 -06: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
Mike Adams
664880e089 Add run_on_start to SCHEDULE_CONF (#37098) 
This is a fix for 37037.
 2016-10-19 18:04:42 -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
Anton Ustyugov
0a2bc366bd add size converter and start convert active size 2016-10-19 18:16:05 +03: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
454a721bff Merge pull request #37060 from theredcat/lxc 
Add lxc.get_pid and lxc.add_veth
 2016-10-19 11:43:42 +09:00
Mike Place
d97f649557 Merge pull request #37066 from Unity-Technologies/feature/powercfg_schemes 
Allowed for specifying the scheme for powercfg
 2016-10-19 11:39:02 +09:00
Mike Place
ada18f74c1 Merge pull request #37067 from mamalos/add-keyword-arguments-support-to-decorators-memoize 
added support for keyword arguments (**kwargs) caching in decorators.…
 2016-10-19 11:37:44 +09:00
Fake-Name
a2a9ac0e9a Fix issue https://github.com/saltstack/salt/issues/37063 2016-10-18 19:34:09 -07: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
e000be9d50 Merge pull request #37082 from skob/develop 
Bugfix for salt-runner and LXC clouds
 2016-10-19 11:18:19 +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
Карамышев Степан
94078fdfa7 Bugfix for salt-runner and LXC clouds 2016-10-19 00:21:33 +03: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
Nicole Thomas
d4961562fc Merge pull request #35997 from rallytime/clean-up-35514 
Clean up #35514
 2016-10-18 11:32:26 -06:00
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
Nicole Thomas
0617924a54 Merge pull request #37074 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-18 10:35:02 -06:00
Nicole Thomas
a5c26d411d Merge pull request #37073 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-18 10:34:49 -06:00
rallytime
bab91dbe91 Don't compare a (0,) object to None in skipIf 
We should check to make sure the version is > 0 to run the test
 2016-10-18 10:22:31 -06:00