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
71,797 Commits 24 Branches 182 Tags 341 MiB
8a700b54f8
Commit Graph

71797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
e50ce384c0 Fix git integration tests for Windows 2016-07-25 15:45:11 -07: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
twangboy
0f74afc257 Fix test_list_minion for Windows 2016-07-25 14:49:32 -07: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
Owen Synge
52c12727e0 salt.modules.ceph: shortened line 
Trying to pass pylint-3.4

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 17:10:40 +02:00
Owen Synge
f4a38a3f8d salt.modules.ceph: Fixed unused paramter 
Trying to pass pylint-3.4

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 17:09:21 +02:00
Owen Synge
a72d29a3ee salt.modules.ceph: bad-whitespace 
Trying to pass pylint-3.4

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 17:07:18 +02:00
Owen Synge
19c1f22f2e salt.modules.ceph: shortened line 
Trying to pass pylint-3.4

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 17:04:52 +02: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
Owen Synge
114412a6f6 salt.states.ceph: Add module metadata 
Salt has a rich metadata format for all state modules.

Also improved the online help.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 15:28:45 +02:00
徐磊xulei
b1ab8b6270 pv_present should execute pvcreate with -y if existing filesystem signature detected 2016-07-25 21:27:10 +08:00
Owen Synge
2ed61d22fb salt.moduels.ceph: Add module metadata 
Salt has a rich metadata format for all modules.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 15:21:40 +02:00
Owen Synge
7f3bb97090 salt.states.ceph: Mark up the YAML. 
The state method should have the YAML marked up.

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 15:08:38 +02:00
Owen Synge
a3fbb5d01e salt.modules.ceph: Add CLI examples 
Add CLI paramters and CLI exampls to the methods of the module ceph

Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 15:05:50 +02:00
Owen Synge
e8e05a1f69 salt.states.ceph: Use triple ' in block comments. 
Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 13:45:18 +02:00
Owen Synge
3f4a56464d salt.modules.ceph: Use triple ' in block comments. 
Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 13:43:30 +02:00
Owen Synge
3e9b6eac4c salt.states.ceph: Define the text as UTF 8 
Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 13:41:55 +02:00
Owen Synge
946443dbf5 salt.modules.ceph: Define the text as UTF 8 
Signed-off-by: Owen Synge <osynge@suse.com>
 2016-07-25 13:41:27 +02: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
Mike Place
caf0361bc1 Merge pull request #34807 from terminalmage/issue2707 
Feature addition: preserve mode in file states
 2016-07-22 16:43:31 -06:00
Nicole Thomas
6394030db3 Add VirtuozzoLinux is yumpkg enable list. (#34902) 2016-07-22 16:43:23 -06:00
Mike Place
38ac79d8bb Merge pull request #34829 from gtmanfred/py3 
[PY3] tests.unit.pillar
 2016-07-22 16:33:47 -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
5e0c63c0eb Merge pull request #34886 from eradman/cron 
Preserve trailing lines in crontab
 2016-07-22 16:25:23 -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
365fca3c60 Merge pull request #34895 from skizunov/develop2 
Fix console and file logging on Windows
 2016-07-22 16:23:32 -06:00