96514 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
markuskramerIgitt	3c6dd1dab8	comments	2018-08-02 23:36:35 +02:00
markuskramerIgitt	054c503018	comments	2018-08-02 22:51:42 +02:00
markuskramerIgitt	189ede1ee5	comments	2018-08-02 22:47:20 +02:00
markuskramerIgitt	2d21d30b65	comments	2018-08-02 22:33:10 +02:00
Nicole Thomas	12081f2ef3	Merge pull request #48815 from pengyao/salt_utils_http_parse_cookie_header ... Fix parse_cookie_header function cookie name always None	2018-07-31 16:48:02 -04:00
Nicole Thomas	370f74070d	Merge pull request #48462 from babs/fix-issue-48461-state-git-identity ... Fix git state identity lacking of user expansion #48461	2018-07-31 16:29:26 -04:00
Nicole Thomas	c4a3510517	Merge pull request #48615 from wagdav/dev-watchdog ... Implement a cross platform file monitoring beacon	2018-07-31 16:28:23 -04:00
Nicole Thomas	7fddbeaa13	Merge pull request #48842 from alexvasiu/dev/avasiu/fix_adapter_mode ... modules/nilrt_ip.py: Fix _get_adapter_mode	2018-07-31 15:16:40 -04:00
Nicole Thomas	232db0a967	Merge pull request #48733 from mirceaulinic/ciscoconfparse-mod ... Add ciscoconfparse execution module for various text config mainipulations	2018-07-31 15:13:28 -04:00
Nicole Thomas	b3267b3366	Merge pull request #48821 from rallytime/fluorine-deprecations-cloud ... [develop] Fluorine deprecations in cloud util (and related functions)	2018-07-31 15:04:00 -04:00
Mike Place	4b3b7db32d	Merge pull request #48850 from rallytime/kill-master-test ... Skip tests in integration.shell.test_master	2018-07-31 12:44:23 -06:00
rallytime	65123e92d0	Skip tests in integration.shell.test_master ... Related to https://github.com/saltstack/salt-jenkins/issues/378 This is likely causing all of the flakiness we're seeing on test runs when the master stops responding. These tests should be in their own, isolated run, rather than with the rest of the test suite.	2018-07-31 14:39:48 -04:00
Nicole Thomas	0eb622fc72	Merge branch 'develop' into salt_utils_http_parse_cookie_header	2018-07-31 12:26:02 -04:00
Nicole Thomas	f54a33c94d	Merge pull request #48833 from dmurphy18/solaris_df ... Changed Solaris default for disk.usage to 1 K blocks	2018-07-31 12:02:08 -04:00
Nicole Thomas	1488a89983	Merge branch 'develop' into ciscoconfparse-mod	2018-07-31 11:40:00 -04:00
Nicole Thomas	9eb9e1af4a	Merge pull request #48841 from gtmanfred/lint ... fix pylint for config module	2018-07-31 11:25:46 -04:00
Nicole Thomas	531955b279	Merge branch 'develop' into fluorine-deprecations-cloud	2018-07-31 11:07:01 -04:00
Alexandru Vasiu	3dd207ceb6	modules/nilrt_ip.py: Fix _get_adaptor_mode ... The value returned by _load_config may have upper letters. Signed-off-by: Alexandru Vasiu <alexandru.vasiu@ni.com>	2018-07-31 17:31:16 +03:00
Daniel Wallace	907c34d6eb	fix pylint for config module	2018-07-31 09:21:08 -05:00
David Murphy	2f3de8fa0a	Changed Solaris default for disk.usage to 1 K blocks	2018-07-30 18:13:28 -06:00
David Wagner	182736372e	Add tests for watchdog beacon.	2018-07-30 21:36:15 +02:00
David Wagner	5f3e3f4766	Add watchdog beacon for cross platform file monitoring. ... Resolves #28135	2018-07-30 21:36:15 +02:00
Nicole Thomas	05f5aab2d7	Merge pull request #48631 from gtmanfred/rfc ... [RFC] add rfc for loader changes in Fluorine	2018-07-30 12:17:00 -04:00
rallytime	f46d4e0a26	[develop] Fluorine deprecations in cloud util (and related functions) ... Since `Fluorine` was misspelled in a couple of places and subsequently fixed, the removal of the `cache_nodes_ip` function was missed. This PR removes the deprecated `cache_nodes_ip` function from salt.utils.cloud. This PR also updates some of the warn_util versions to match the removal/support warning message. The `warn_util` version was set to `Fluorine`, but the "will be removed in version" message stated Sodium. Sodium is the correct version, so the docs and warn_util versions have been corrected.	2018-07-30 11:46:13 -04:00
pengyao	8029ad45f0	Fix parse_cookie_header function cookie name always None ... parse_cookie_header function is used when backend is tornado. But cookie name is always None, because programe not set name correct value	2018-07-30 11:34:46 +08:00
Nicole Thomas	8c206a505d	Merge pull request #48800 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-07-27 17:29:48 -04:00
Nicole Thomas	6fcc57c971	Merge pull request #48797 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-07-27 14:05:03 -04:00
Nicole Thomas	73ec7fbb24	Merge pull request #48617 from alexvasiu/dev/avasiu/add_ethercat_support ... modules/nilrt_ip.py: Add EtherCAT Support	2018-07-27 14:01:43 -04:00
Nicole Thomas	ac5f5d4436	Merge pull request #48794 from rares-pop/dev/iepopr/fix-salt.utils.process-catch-keyerror ... Fix salt.utils.process.py set_pidfile regression	2018-07-27 13:20:40 -04:00
Nicole Thomas	d6f59aab70	Merge pull request #48494 from rallytime/fix-40532 ... Deprecate 'master_shuffle' in favor of 'random_master'	2018-07-27 13:19:35 -04:00
rallytime	5a22d28c83	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/state.py - salt/utils/http.py - tests/integration/modules/test_state.py	2018-07-27 11:53:34 -04:00
Alexandru Vasiu	354e664746	modules/nilrt_ip.py: Fix argument for function _load_config ... Signed-off-by: Alexandru Vasiu <alexandru.vasiu@ni.com>	2018-07-27 17:07:56 +03:00
rallytime	13d0a7cea8	Reduce the number of days an issue is stale by 10	2018-07-27 09:43:20 -04:00
Nicole Thomas	5afd64ee85	Merge pull request #48736 from cbosdo/virt-running ... Update existing VMs in virt.running	2018-07-27 09:33:58 -04:00
Nicole Thomas	fe66023cc2	Merge pull request #48681 from Arabus/add-config-items-function ... Add query current minion config with config.items	2018-07-27 09:28:58 -04:00
Rares POP	1008d2717a	Fix salt.utils.process.py regression ... Doing a pwd.getpwnam() will raise a KeyError exception that is not catched anymore, after a change that happened in 2012. Do catch that. Signed-off-by: Rares POP <rares.pop@ni.com>	2018-07-27 16:03:02 +03:00
Cédric Bosdonnat	8f3f593dc1	Rename states/test_libvirt.py into states/test_virt.py ... Modules test files are named after the module itself, the state virt module needs to comply with that rule too.	2018-07-27 09:27:45 +02:00
Cédric Bosdonnat	2a5f6ae5d6	Updating running domains in virt.running ... So far virt.running does nothing if the corresponding domain is already defined. Use the new virt.update function to change the domain configuration.	2018-07-27 09:27:45 +02:00
Cédric Bosdonnat	333d14936c	Add virt.update function ... User need to be able to update an existing virtual machine definition. This function changes the definition for the next start of the VM and tries hard to live update the virtual machine.	2018-07-27 09:27:44 +02:00
Cédric Bosdonnat	a0410393ca	virt.init: allow 'none' graphics type ... Graphics type 'none' will help to distinguish between no graphics data and removal of graphics device in a future virt.update function.	2018-07-27 09:27:44 +02:00
Cédric Bosdonnat	0f5184c45c	Remove minidom use in virt module ... ElementTree provides a more convenient API than minidom. Switching to ElementTree will reduce the number of dependencies for the virt module and simplify the code a little.	2018-07-27 09:27:44 +02:00
Cédric Bosdonnat	a3ccf8173c	Add virt.pool_info test case with no target element ... The target element is not mandatory, introduce a test that we properly handle this situation	2018-07-27 09:27:44 +02:00
Nicole Thomas	3f5349dfa2	Merge pull request #48739 from mirceaulinic/net-mod-funs ... Add a few functions for network configuration manipulation	2018-07-26 16:48:34 -04:00
Nicole Thomas	f428d2ad22	Merge pull request #48774 from jdito/add-gluster-arbiter ... Added ability to create replica 3 arbiter 1 gluster volumes	2018-07-26 16:44:03 -04:00
Daniel Wallace	04cd9a346a	Merge pull request #48783 from KaiSforza/pr-lint-only-diff ... Only run lint checks against changed files	2018-07-26 15:07:58 -05:00
William Giokas	84f1819f9a	Threshold was wrong ... I also removed the delta value check. It's going to be weird with the number of runs we do, and it's also set to run on failures.	2018-07-26 13:19:07 -06:00
William Giokas	335dc764e8	test: except for OSError only	2018-07-26 12:52:27 -06:00
Nicole Thomas	f05b86979a	Merge branch 'develop' into fix-40532	2018-07-26 14:20:48 -04:00
Joe DiTommasso	7fae90c2bf	Fixing versionadded tags	2018-07-26 14:18:23 -04:00
Nicole Thomas	4cc778ab3d	Merge pull request #48755 from markuskramerIgitt/test_minion_id_lowercase ... Add configuration test for minion_id_lowercase	2018-07-26 14:18:05 -04:00