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
71,677 Commits 24 Branches 182 Tags 341 MiB
99871f4c33
Commit Graph

71677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedikt Heine
99871f4c33 [bash-completion] cache function completions 
Cache the function completions. This may be neccessary if timeout is too
high and therefore you may get stuck on your input line.
 2016-07-26 23:56:56 +02:00
Erik Johnson
0c08724a7c Merge pull request #34118 from ctrlrsf/i-33907-dont-walk-file-ignore-dirs 
Don't traverse directories that match file_ignore_regex and file_ignore_glob
 2016-07-26 15:28:03 -05:00
Nicole Thomas
73d3b77a2c Merge pull request #34960 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-26 12:32:41 -06:00
Mike Place
55bb3d09ab Merge pull request #34919 from tonybaloney/libcloud_dns_states 
Add a new state module for managing DNS records and zones through Libcloud
 2016-07-26 11:51:08 -06:00
Mike Place
21e0ae8d30 Merge pull request #34925 from BrickXu/develop 
pv_present should execute pvcreate with -y if existing filesystem sig…
 2016-07-26 11:28:57 -06:00
Mike Place
407604601d Merge pull request #34943 from terminalmage/zd868 
Add jid to orchestration returns
 2016-07-26 11:23:58 -06:00
Mike Place
b29d3c95a8 Merge pull request #34932 from bebehei/fix-hide-timeout 
[bash-completion] hide timeout in salt-output
 2016-07-26 11:18:59 -06:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
 2016-07-26 11:05:24 -06:00
Mike Place
deb1331601 Merge pull request #34935 from rallytime/beacons-mod-cleanup 
Avoid UnboundLocalError in beacons module
 2016-07-26 11:01:23 -06:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
Shane Lee
84e2e8b101 Fix grains integration tests for Windows (#34941) 2016-07-26 10:49:10 -06:00
Anthony Shaw
6c08afd62b GCE Cloud tests (#34871) 
* add test module

* modify GCE tests to remove mocks

* use certifi, libcloud has also patched the SuSE/Mac cert issues

* skip cert checking

* validate the __virtual__ and import process

* fix munged merge

* fixed lint errors and failing test

* fix dimensiondata tests in the same way whilst I'm here
 2016-07-26 09:24:20 -06:00
Joseph Hall
cdc9882f83 Create regdata before try/except (#34931) 2016-07-26 09:05:24 -06:00
Joseph Hall
e1a6ebac3a Add prune option to reg.list (#34934) 2016-07-26 09:03:52 -06:00
Shane Lee
c4131c0afb Skip inode test in Windows (#34938) 2016-07-26 08:59:47 -06:00
Jakub Pavlik
21fe1a0f95 Remove use_carrier bond for Ubuntu Xenial later (#34779) 
network.managed type bond generate use_carrier
option, which is unknown parameter in ubuntu 16.04

Fixes #34778
 2016-07-26 08:53:12 -06:00
Mike Place
29baba7574 Merge pull request #34948 from bebehei/bashcompletion-saltkey 
Bashcompletion salt-key remove headers
 2016-07-26 08:36:26 -06:00
Erik Johnson
04eb5e7e31 Add jid to salt.function orchestration events 2016-07-26 09:23:30 -05:00
Benedikt Heine
3cd47297ed [bashcompletion] replace ticks with bash subshell 2016-07-26 14:58:59 +02:00
Benedikt Heine
9091f0bffa [bashcompletion] ignore salt-key headers 2016-07-26 14:56:20 +02:00
Erik Johnson
60240e28d6 Add jid to orchestration returns 
This will make it easier to track the jids of jobs spawned by the
state.orchestrate runner.
 2016-07-25 21:34:19 -05: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
97a36ef367 Avoid UnboundLocalError in beacons module 
Also import the correct salt.utils.event lib (not just salt.utils)
 2016-07-25 14:27:26 -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
Benedikt Heine
a7b400e923 [bash-completion] hide timeout in salt-output 
hide timeout and not corrupt the output of salt, when
show_timeout is set in master config
 2016-07-25 21:19:02 +02: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
徐磊xulei
b1ab8b6270 pv_present should execute pvcreate with -y if existing filesystem signature detected 2016-07-25 21:27:10 +08:00
Mike Place
0e0c428469 Merge pull request #34891 from rallytime/serializer-unit-tests 
Update serializers/configparser.py for Py3 use.
 2016-07-25 04:21:41 -06:00
Elias Probst
69afcc4060
Handle exception when no Slack API key was provided 2016-07-25 11:39:29 +02:00
Anthony Shaw
8df4c35f5c
zone absent with tests 2016-07-24 19:48:11 +10:00
Anthony Shaw
3b5ddcb607
added zone_present state check 2016-07-24 19:45:06 +10:00
Anthony Shaw
4d7f3169f6
added zone_present state check 2016-07-24 19:43:06 +10:00
Anthony Shaw
fa04e2fcf5
use the correct dictionary structure for state changes 2016-07-24 19:30:32 +10:00
Anthony Shaw
fa5ac70183
add record absent logic and tests 2016-07-24 19:16:48 +10:00
Anthony Shaw
7f28b14958
fix tests 2016-07-24 19:06:34 +10:00
Anthony Shaw
51654e9b7a
add record name to mocks 2016-07-24 17:34:29 +10:00
Anthony Shaw
cb13bb6fba
add test with mocked execution module 2016-07-24 17:13:51 +10:00
Mike Place
7e4ebc3961 Merge pull request #34913 from terminalmage/issue2707 
Update unit test
 2016-07-22 20:25:17 -06:00
Erik Johnson
92fffb06a7 Update unit test 
This unit test asserts based on the args with which a function was
called, and the args were changed which broke the test. This fixes the
test.
 2016-07-22 21:21:55 -05:00
Mike Place
3555d05bf0 Merge pull request #34912 from cachedout/fix_config_test 
Config test no longer applies to new test config
 2016-07-22 19:00:22 -06:00
Mike Place
baee2f2558 Config test no longer applies to new test config 2016-07-22 18:59:31 -06: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
Mike Place
1aee8b7dd4 Merge pull request #34906 from cachedout/set_run_salt_timeout 
Set timeout for run_salt in test suite
 2016-07-22 16:43:48 -06:00