69540 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	a2439acbc9	systemd.py: check retcode for service availability in systemd >= 231 ... systemd 231 changed the output for "systemctl status" for unrecognized services. This causes Salt to fail to be able to determine if the service could be found, resulting in an exception being raised. systemd 231 also made a change to the retcode of "systemctl status" to distinguish unrecognized services from ones which simply are not running. This commit does a systemd version check, and for versions >= 231 checks the retcode to determine whether or not a given service is available.	2016-10-03 22:39:04 -05:00
Mike Place	93f1daa4ce	Merge pull request #36744 from cachedout/fix_test_shutdown ... Fix issue where test suite could hang on shutdown	2016-10-04 00:37:00 +09:00
Mike Place	cdf2a56564	Fix issue where test suite could hang on shutdown ... This is most common in the develop branch but could occur here as well.	2016-10-03 23:37:05 +09:00
Mike Place	6fa9ec36d2	Merge pull request #36696 from cro/proxy_in_sls_id ... pass __proxy__ in state.sls_id	2016-10-01 18:37:50 +09:00
Mike Place	e0b288feb3	Merge pull request #36716 from vutny/fix-ini-manage ... salt.modules.ini_manage: fix creating options in empty file	2016-10-01 18:35:11 +09:00
Mike Place	97713b09f5	Merge pull request #36724 from rallytime/bp-36628 ... Back-port #36628 to 2016.3	2016-10-01 18:33:43 +09:00
Mike Place	8e7529764b	Merge pull request #36725 from rallytime/bp-36643 ... Back-port #36643 to 2016.3	2016-10-01 18:33:13 +09:00
Mike Place	cf32c59b6a	Merge pull request #36726 from rallytime/bp-36722 ... Back-port #36722 to 2016.3	2016-10-01 18:32:53 +09:00
rallytime	5904cc04c6	Skip cmd_unzip test if salt.utils.which('zip') isn't available ... This test relies on running archive.cmd_zip in order to have something to test running archive.cmd_unzip against. Some distros will have the unzip binary available, but not the zip binary. We need to protect this test against both so we don't have a false failure on trying to run archive.cmd_zip.	2016-09-30 16:02:42 -06:00
James Loosli	c5b8e442f9	a small, and unfortunate error	2016-09-30 16:01:38 -06:00
Yoram Hekma	3bb2cb6379	Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy	2016-09-30 15:59:21 -06:00
C. R. Oldham	891004f3be	try/except for when __proxy__ is not injected.	2016-09-30 14:13:34 -06:00
Megan Wilhite	48d2b01e6c	fix python26 archive zip module (#36719)	2016-09-30 13:14:01 -06:00
Denys Havrysh	73eb773fb0	salt.modules.ini_manage: fix creating options in empty file	2016-09-30 18:14:19 +03:00
Mike Place	7d022a3f39	Merge pull request #36699 from cachedout/fixup_36616 ... Fix error in test	2016-09-30 20:28:18 +09:00
Mike Place	16f5bb70ec	Remove line that checks against unordered keys	2016-09-30 20:24:49 +09:00
Mike Place	0aa35596c0	Merge pull request #36670 from jackywu/2016.3 ... fix bug for including loopback addr	2016-09-30 19:21:53 +09:00
Mike Place	0e8c9abe8d	Merge pull request #36694 from lorengordon/issue-36692 ... Exposes `ignore_if_missing` to file.replace state module	2016-09-30 19:12:26 +09:00
Mike Place	0e9148293a	Fix error in test ... Introduced in #36616 cc: @cro	2016-09-30 11:38:03 +09:00
Loren Gordon	35f3bb3a8a	Exposes ignore_if_missing to file.replace state module ... Fixes #36692	2016-09-29 18:27:12 -04:00
C. R. Oldham	e8e53d60be	pass __proxy__ in state.sls_id	2016-09-29 13:59:23 -06:00
C. R. Oldham	c089ac6c67	Merge pull request #36686 from jfindlay/log_levels ... log levels doc: try long form table	2016-09-29 12:21:47 -06:00
Nicole Thomas	e0a851b2f1	Merge pull request #36690 from rallytime/merge-2016.3 ... [2016.3] Merge forward from 2015.8 to 2016.3	2016-09-29 11:46:24 -06:00
rallytime	7fc38c9aca	Merge branch '2015.8' into '2016.3' ... No conflicts.	2016-09-29 10:59:09 -06:00
Nicole Thomas	7d1972bd5c	Merge pull request #36684 from rallytime/merge-2015.8 ... [2015.8] Merge forward from 2015.5 to 2015.8	2016-09-29 10:53:19 -06:00
Nicole Thomas	f95dd696e5	Merge pull request #36680 from rallytime/merge-2016.3 ... [2016.3] Merge forward from 2015.8 to 2016.3	2016-09-29 10:49:16 -06:00
Justin Findlay	4dd4fc94dc	log levels doc: try long form table ... sphinx didn't render the shorthand table	2016-09-29 10:11:06 -06:00
rallytime	838722d225	Merge branch '2015.5' into '2015.8' ... No conflicts.	2016-09-29 10:02:46 -06:00
Nicole Thomas	8f1ba2fa26	Merge pull request #36678 from rallytime/merge-2015.5 ... [2015.5] Merge forward from 2014.7 to 2015.5	2016-09-29 09:44:56 -06:00
rallytime	3e4ac617d3	Merge branch '2015.8' into '2016.3' ... Conflicts: - tests/integration/cli/grains.py - tests/integration/files/file/base/issue-2068-template-str-no-dot.sls - tests/integration/files/file/base/issue-2068-template-str.sls - tests/integration/modules/pip.py	2016-09-29 09:15:26 -06:00
rallytime	51240ecb13	Merge branch '2014.7' into '2015.5' ... Conflicts: - salt/modules/linux_lvm.py	2016-09-29 09:02:34 -06:00
wucheng	48d2d512d8	fix bug for including loopback addr ... addrs.discard('127.0.0.1') already remove 127.0.0.1 out of addrs, and salt.utils.network.ip_addrs will ignore 127.0.0.1 by default, so the code of line 589 `if ipv4 in addrs` will not works forever, because 127.0.0.1 will never be in addrs.	2016-09-29 17:39:10 +08:00
Mike Place	e4c5d0bfd6	Merge pull request #36664 from cachedout/remove_useless_size_check ... Remove possible race between grains dumps in test	2016-09-29 15:36:27 +09:00
Mike Place	3d098c64ef	Remove possible race between grains dumps in test ... It's not always reasonable assume that grains will be the same byte-for-byte between invocations. Remove that assumption since it isn't related to the what's under test here anyhow.	2016-09-29 15:34:50 +09:00
Mike Place	8cfe371a5a	Merge pull request #36663 from cachedout/skip_pip_tests_on_download_fail ... Fix error in pip test	2016-09-29 15:15:52 +09:00
Mike Place	0c7fb91dc5	Fix error	2016-09-29 15:14:37 +09:00
Mike Place	e3f8618982	Merge pull request #36662 from cachedout/skip_pip_tests_on_download_fail ... Skip over tests where upstream pip isn't there	2016-09-29 15:12:26 +09:00
Mike Place	0bbc60ccd7	Skip over tests where upstream pip isn't there	2016-09-29 15:11:38 +09:00
Mike Place	eab1680f3f	Merge pull request #36659 from terminalmage/issue28125 ... Support dynamic env in new-style git_pillar	2016-09-29 14:04:38 +09:00
Mike Place	3249a11e71	Merge pull request #36661 from cachedout/fix_grain_test_race ... Fix race between minion job timeout and cli test timeout	2016-09-29 13:42:23 +09:00
Mike Place	b0190f248e	Merge pull request #36660 from cachedout/fix_2068_issue_test ... Fix test not to rely on external resources	2016-09-29 13:42:01 +09:00
Mike Place	2dcb92134d	Fix race between minion job timeout and cli test timeout	2016-09-29 13:23:26 +09:00
Mike Place	f4906fe771	Fix test not to rely on external resources ... We can still model the original issue without needing to call all the way out to pypi to do it.	2016-09-29 12:35:02 +09:00
Erik Johnson	45352b36bd	Support dynamic env in new-style git_pillar ... This was accidentally omitted when I implemented the gitfs-backed git_pillar for 2015.8.0. This commit adds that functionality back to git_pillar.	2016-09-28 21:51:15 -05:00
Mike Place	0c2bd4b66b	Merge pull request #36538 from clinta/daemon-reload ... daemon-reload on call to service.avaliable	2016-09-29 11:28:00 +09:00
Mike Place	d8a61eb9f6	Merge pull request #36616 from cro/zypper_fix_test ... Zypper fix test	2016-09-29 11:26:22 +09:00
Mike Place	ccd92d22d2	Merge pull request #36621 from terminalmage/fix-shadowed-builtins ... Fix shadowed builtins	2016-09-29 11:25:54 +09:00
Mike Place	24f82b2809	Merge pull request #36636 from rallytime/bp-36618 ... Back-port #36618 to 2016.3	2016-09-29 11:23:09 +09:00
Mike Place	86dc3dc9f7	Merge pull request #36641 from fuzzy-id/fix-lvm-thin-argument ... fix thin argument for `lvm.lvcreate'	2016-09-29 11:19:56 +09:00
Mike Place	750ff8220c	Merge pull request #36648 from jfindlay/arch_test ... Integration tests for archive execution module	2016-09-29 11:16:54 +09:00