valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,265 Commits 24 Branches 182 Tags 341 MiB
66f6467ba3
Commit Graph

75265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedikt Werner
4193ef156f Fixed style of sensehat module 2016-10-24 12:15:31 +02:00
Mike Place
0d7af935e5 Merge pull request #37175 from cachedout/fix_test_hange 
Fix test hang
 2016-10-24 18:55:37 +09:00
Mike Place
4cad3cc190 Merge pull request #37173 from sitepoint/rsync_rsh_support 
Add rsync module remote shell (-e) support.
 2016-10-24 18:55:10 +09:00
Mike Place
0fecb5ff2e
Remove sleep. Thanks @s0undt3ch 2016-10-24 18:38:49 +09:00
Christian McHugh
e879e9cf8c remove extra spaces 2016-10-24 08:13:53 +01:00
Mike Place
cedc609503
Fix test suite hang on salt testing 
We don't need to clean up here since the test suite will handle it for us.
 2016-10-24 15:52:33 +09:00
Mike Place
5877233aef Merge pull request #36971 from mamalos/adding-freebsdupdate-support 
added support for freebsd_update #36675
 2016-10-24 12:52:07 +09:00
Mike Place
cf542eeab3 Merge pull request #37136 from xbglowx/pass_renderer 
Create pass renderer
 2016-10-24 12:29:26 +09:00
Mike Place
b3e79dcd51 Merge pull request #37139 from awerner/fix-spm-download-remote-download 
Download spm package from remote repository and save it to cache
 2016-10-24 12:29:05 +09:00
Mike Place
1e97df7540 Merge pull request #37142 from DSRCorporation/bugs/36866_salt-minion_communication_broken 
status.master: don't fail if host_to_ips returns None
 2016-10-24 12:21:23 +09:00
Mike Place
334313ec64 Merge pull request #37144 from DSRCorporation/bugs/36866_salt-minion_communication_broken_2016.3 
Bugs/36866 salt minion communication broken 2016.3
 2016-10-24 12:19:06 +09:00
Mike Place
3a5234939c Merge pull request #37154 from bl4ckcontact/win_system_disable_flag 
modules.win_system.py: Fix flag disabling AD Computer objects
 2016-10-24 12:18:39 +09:00
Mike Place
d1fb992ef5 Merge pull request #37147 from kakwa/doc_safe_pillar 
add explicit reference to grains['id'] as a 'safe' grain for pillars
 2016-10-24 12:18:09 +09:00
Mike Place
d7798c5cc3 Merge pull request #37149 from dincamihai/fix-pkg.latest_version 
Fix pkg.latest_version when latest already installed
 2016-10-24 12:16:03 +09:00
Mike Place
d98d72fe09 Merge pull request #37156 from UtahDave/add_pr_docs 
Add pull request  docs
 2016-10-24 12:15:15 +09:00
Mike Place
c5d81a8ade Merge pull request #37158 from jfindlay/mac_skip_uptime 
add mock for `status.uptime` unit test
 2016-10-24 12:13:53 +09:00
Mike Place
af8bf25258 Merge pull request #37160 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-24 12:13:30 +09:00
Mike Place
e51f90b459 Merge pull request #37161 from rallytime/bp-37098 
Back-port #37098 to 2016.3
 2016-10-24 12:13:14 +09:00
Adam Bolte
22cf7a48e2
Add rsync module remote shell (-e) support. 2016-10-24 14:10:44 +11:00
Mike Place
4d603894d0 Merge pull request #37164 from sjorge/pdbedit 
module and state for pdbedit
 2016-10-24 12:03:48 +09:00
Mike Place
c3304d430e Merge pull request #37165 from sjorge/develop-ifttt-typo 
fix tiny typo in itfff state docs
 2016-10-24 11:54:44 +09:00
Mike Place
3a3838eed9 Merge pull request #37166 from aphor/macports 
upgrade macports salt to v2016.11
 2016-10-24 11:41:18 +09:00
Mike Place
dd70e8785b Remove extra blank line 2016-10-24 11:25:24 +09:00
Benedikt Werner
717daff3e5 Fixed __salt__ call in sensehat beacon 2016-10-23 16:03:45 +02:00
Benedikt Werner
cc5978dc39 sensehat rotation is now read from a pillar 2016-10-23 15:52:49 +02:00
Benedikt Werner
c1e60fe583 Fixed sensehat documentation 2016-10-23 13:29:49 +02:00
Fake-Name
5b16e862c3 Shut up print statements. 2016-10-22 22:35:09 -07:00
Fake-Name
45b075d53a Wait for some more flags. Probably not needed, but it should make things more robust. 2016-10-22 22:33:20 -07:00
Christian McHugh
3f8688606c fix lint errors 2016-10-23 02:46:25 +01:00
ttb
137642b845 update documentation of dockerng cpu_shares 2016-10-23 03:02:42 +02:00
Christian McHugh
57649b0a33 remove debug logging 2016-10-23 01:54:04 +01:00
Christian McHugh
17b54edd6c Allow zabbix_host state to assign templates 2016-10-23 01:45:40 +01:00
Daniel Kraemer
40ecc46963 fixes pkgrepo for fedora>22 saltstack/salt#31240 
This makes modules.yumpkg complete independend from yum. yum is not
installed in fedora>22, so this will actually fix pkgrepo in fedora.
 2016-10-22 22:41:33 +02:00
Jeremy McMillan
3cdddcbc87 upgrade macports salt to v2016.11 2016-10-22 11:04:50 -05:00
Super-User
9ea66698e0 fix tiny typo in itfff state docs 2016-10-22 14:29:00 +00:00
Eric Radman
30146115ee Update configuration examples for Joyent (#37153) 
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
 2016-10-22 07:58:46 -06:00
Nicole Thomas
b65db3ab6f Merge pull request #37155 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-22 07:55:59 -06:00
Nicole Thomas
b5025c044e Merge pull request #37159 from rallytime/bp-37107 
Back-port #37107 to 2016.3
 2016-10-22 07:55:47 -06:00
rallytime
240fb45c5c Pylint fix 2016-10-22 07:54:44 -06:00
Nicole Thomas
35b4494157 Merge pull request #37162 from rallytime/bp-36823 
Back-port #36823 to 2015.8
 2016-10-22 07:52:53 -06:00
Nicole Thomas
1e520b3f48 Merge pull request #37163 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-22 07:52:36 -06:00
Super-User
1a428c3d9c sync pdbedit module and state header 2016-10-22 10:59:28 +00:00
Super-User
be72354a03 pdbedit state 2016-10-22 10:58:04 +00:00
Super-User
89a4756478 pdbedit.modify - fix issue of returning double login 2016-10-22 10:44:25 +00:00
Super-User
5c943ddeae generate docs for pdbedit state 2016-10-22 10:14:30 +00:00
Super-User
5d250946c6 pdbedit improve return messages 2016-10-22 10:12:49 +00:00
rallytime
8fff95b3b4 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/gpg.py
  - salt/modules/zypper.py
 2016-10-21 16:09:17 -06:00
Erik Johnson
3032a542d9 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-21 15:56:47 -06:00
Erik Johnson
4826995973 Remove EnvironmentFile and Restart lines from unit files 
These shouldn't be there, because the variables sourced by the
EnvironmentFile are only made available to the Exec commands in the unit
file.
 2016-10-21 15:56:47 -06:00
Erik Johnson
3be15694d2 Use Type=notify for debian systemd units 2016-10-21 15:56:47 -06:00