valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,633 Commits 24 Branches 182 Tags 341 MiB
d80350cdcc
Commit Graph

68633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
Nicole Thomas
5d194f2d17 Merge pull request #34933 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-25 16:09:05 -06:00
rallytime
8b295fe4ea Merge branch '2015.8' into '2016.3' 
Conflicts:
salt/config/__init__.py
salt/utils/parsers.py
tests/integration/__init__.py
 2016-07-25 14:13:44 -06:00
Mike Place
ec8fc058d4 Master performance improvement (#34916) 
Reduce unneeded call to ckminions from master pub. This should be a 2x improvement or so in pub times.
 2016-07-25 09:52:46 -06:00
Alejandro Bednarik
3e32b7c408 Update service_rh provider to exclude XenServer >= 7. (#34915) 
XenServer 7 now used systemd to habdle services.
 2016-07-25 09:19:34 -06:00
Nicole Thomas
a7e7ec6d25 Merge pull request #34926 from rallytime/lint-34923 
Lint #34923
 2016-07-25 08:53:41 -06:00
rallytime
b3514abf1b Lint fixes for #34923 2016-07-25 08:52:35 -06:00
Elias Probst
69afcc4060
Handle exception when no Slack API key was provided 2016-07-25 11:39:29 +02:00
Mike Place
34dc2fd792 Merge pull request #34911 from cachedout/backport_34906 
Backport #34906
 2016-07-22 17:23:24 -06:00
Mike Place
8becec2f4f Backport #34906 2016-07-22 17:22:50 -06:00
Mike Place
c663c8bb5b Merge pull request #34910 from cachedout/proxy_grains 
Fix grains error on proxy minions
 2016-07-22 17:05:46 -06:00
Mike Place
0970ebace8 Fix grains error on proxy minions 2016-07-22 17:04:41 -06:00
jmacfar
815ffdfe45 Check for version in list of installed versions (#34864) 
* Find version in list of installed versions

* lint error
 2016-07-22 16:44:42 -06:00
Nicole Thomas
6394030db3 Add VirtuozzoLinux is yumpkg enable list. (#34902) 2016-07-22 16:43:23 -06:00
Mike Place
6ccc27f697 Merge pull request #34898 from hrumph/list_upgrades_refresh 
Stop multiple refreshes during call to pkg.list_upgrades
 2016-07-22 16:28:42 -06:00
Mike Place
ad640cc046 Merge pull request #34901 from rallytime/fix-34893 
Add VirtuozzoLinux to the list of enabled distros for rpm.py
 2016-07-22 16:23:48 -06:00
Mike Place
5aa532f98b Merge pull request #34900 from rallytime/fix-34890 
Add VirtuozzoLinux to enabled platforms list in rh_service.py
 2016-07-22 16:21:20 -06:00
rallytime
45e2ce10a4 Add VirtuozzoLinux to the list of enabled distros for rpm.py 2016-07-22 14:46:45 -06:00
rallytime
12824487cc Add VirtuozzoLinux to enabled platforms list in rh_service.py 
Fixes #34890
 2016-07-22 14:43:09 -06:00
Michael Walton
acd4b1a23b Fixes #33620 2016-07-22 15:46:29 -04:00
Nicole Thomas
ebebfa647f Merge pull request #34887 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-22 12:04:47 -06:00
Thomas S Hatch
5c13ee0e72 Merge pull request #34606 from isbm/isbm-config-reading-exit-2015.8 
Bugfix: Exit on configuration read (backport)
 2016-07-22 11:35:18 -06:00
Thomas S Hatch
eba34f7f4c Merge pull request #34632 from eliasp/2016.3-create-logdir-when-needed 
Try to create the log directory when not present yet
 2016-07-22 11:34:31 -06:00
Thomas S Hatch
965f517889 Merge pull request #34854 from rallytime/cleanup-state-imports 
Remove string_types import from state compiler
 2016-07-22 11:20:15 -06:00
Thomas S Hatch
584d7606d4 Merge pull request #34865 from thatch45/break_suse 
This needs discussion, since this breaks SUSE
 2016-07-22 11:19:34 -06:00
rallytime
109b368d19 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-22 10:32:59 -06:00
Thomas S Hatch
fb223e1bd4 Invalidate the target cache very quickly (#34862) 2016-07-22 09:34:08 -06:00
Erik Johnson
1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (#34869) 
* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
 2016-07-22 09:04:05 -06:00
Thomas S Hatch
6c5f363921 This needs discussion, since this breaks SUSE 
But it does fix all other distros....
 2016-07-21 16:37:43 -06:00
Nicole Thomas
aaede31f66 Merge pull request #34858 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-21 15:01:16 -06:00
Mike Place
4f4381e5b9 Merge pull request #34859 from cachedout/fix_wheel_test 
Fix wheel test
 2016-07-21 13:55:25 -06:00
Mike Place
b4be66dedf Fix wheel test 
Fix random ordering bug
 2016-07-21 13:54:32 -06:00
rallytime
9227c3dd26 Merge branch '2015.8' into '2016.3' 
Conflicts:
  -   -   -   -   -   -   -   -   - conf/master
 2016-07-21 13:39:21 -06:00
Mike Place
acc9e31c02 Merge pull request #34822 from thatch45/ssh_fixes 
Fix salt-ssh state.high and state.low
 2016-07-21 13:16:19 -06:00
rallytime
73d3075ce9 Remove string_types import from state compiler 
We have already import salt.ext.six above - no need to do it twice
 2016-07-21 12:09:29 -06:00
Thomas S Hatch
5d91139bc9 Merge pull request #34847 from cachedout/pwall 
Add an option to skip the verification of client_acl users
 2016-07-21 11:55:55 -06:00
Mike Place
b3d8143d36 Merge pull request #34852 from rallytime/skip-gce-tests 
Skip GCE unit tests - causes test suite to hang
 2016-07-21 11:52:31 -06:00
Nicole Thomas
7423177491 Update 2016.3.2 release notes (#34850) 2016-07-21 11:18:31 -06:00
Mike Place
650674d14a Merge pull request #34844 from vutny/fix-grains-load-in-config-init 
Fix getting total available memory without `psutil` installed
 2016-07-21 11:12:37 -06:00
rallytime
15b4f5a8b3 Skip GCE unit tests - causes test suite to hang 2016-07-21 10:53:00 -06:00
Nicole Thomas
59fffa86bc Update release notes for 2016.3.2 (#34848) 2016-07-21 10:02:01 -06:00
Mike Place
2c8298dc6e Profile logging 2016-07-21 09:54:52 -06:00
Mike Place
3affafa2e9 Add an option to skip the verification of client_acl users 2016-07-21 09:51:45 -06:00
Mike Place
07d1d36653 Merge pull request #34827 from thatch45/34691 
fix beacon list to include all beacons being processed
 2016-07-21 08:49:56 -06:00
Mike Place
b375720251 Merge pull request #34833 from rallytime/bp-28521 
Back-port #28521 to 2015.8
 2016-07-21 08:37:24 -06:00
Mike Place
52a95b2ea3 Merge pull request #34837 from thatch45/34345 
Fix #34345
 2016-07-21 08:36:15 -06:00
Mike Place
96450ac74d Merge pull request #34838 from thatch45/unless_valid 
Check if a valid value is passed to unlyif/unless
 2016-07-21 08:34:29 -06:00
Mike Place
3a5ef86d58 Merge pull request #34840 from thatch45/state_update_ssh 
update the state wrapper to include show_low_sls
 2016-07-21 08:34:02 -06:00
Mike Place
5f67318fd7 Merge pull request #34842 from sjorge/2016.3-zpool-simplifaction 
2016.3 zpool cleanup and fixes
 2016-07-21 08:32:55 -06:00
Denys Havrysh
4dc7827020 Fix comment in master config, prevents the service from starting 2016-07-21 15:43:48 +03:00