96487 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	531955b279	Merge branch 'develop' into fluorine-deprecations-cloud	2018-07-31 11:07:01 -04: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
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
Nicole Thomas	6978ce5d1d	Merge pull request #48747 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-07-26 14:14:33 -04:00
Joe DiTommasso	f9f5d67424	Lint fix	2018-07-26 13:30:14 -04:00
William Giokas	efe321a31a	Only run lint checks against changed files	2018-07-26 10:38:09 -06:00
Joe DiTommasso	0d0dc35b13	Updates requested by @rallytime	2018-07-26 12:37:21 -04:00
Nicole Thomas	a7dc3ddcc8	Merge pull request #48762 from mirceaulinic/rm-template-mod ... Get rid of the template module and rework a couple of modules	2018-07-26 11:42:15 -04:00
Nicole Thomas	5ea43817ab	Merge pull request #48771 from gtmanfred/2018.3 ... only do reverse dns lookup on ips for salt-ssh	2018-07-26 11:41:40 -04:00
Mircea Ulinic	9af9100dee	Get rid of the template mod dependency and simplify the code and usage of the pyeapi	2018-07-26 06:48:10 +00:00
Mircea Ulinic	6c70bbadde	Get rid of the template mod dependency and simplify the code and usage of the nxos_api	2018-07-26 06:48:10 +00:00
Mircea Ulinic	ed704b4d49	Get rid of the template mod dependency and simplify the code and usage of the netmiko module	2018-07-26 06:48:02 +00:00
Joe DiTommasso	c36e62c653	Lint fix	2018-07-25 17:58:12 -04:00
jdito	93ade60c70	Merge branch 'develop' into add-gluster-arbiter	2018-07-25 15:40:53 -04:00
Joe DiTommasso	c92fec6f4f	Added ability to create replica 3 arbiter 1 gluster volumes	2018-07-25 15:27:36 -04:00
Markus	b11ad022a7	Merge branch 'develop' into test_minion_id_lowercase	2018-07-25 18:06:21 +02:00
Nicole Thomas	fb5d63da16	Merge pull request #48761 from isbm/isbm-add-saltapi-logrotate ... Add API log rotation on SUSE package	2018-07-25 11:42:45 -04:00
Nicole Thomas	816f7edc81	Merge pull request #48716 from thetoolsmith/develop ... add salt cloud support for block device tagging or root devices and such	2018-07-25 11:07:56 -04:00
Nicole Thomas	f2ef2d3ef6	Merge pull request #48752 from garethgreenaway/fix_state_file_all_integers ... [2018.3] Fix when state file is integers	2018-07-25 11:03:01 -04:00
Nicole Thomas	66a97f270d	Merge pull request #48746 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-07-25 11:01:15 -04:00
Nicole Thomas	705358705c	Merge pull request #48757 from kuetrzi/kuetrzi-patch-1 ... Update carbon_return.py	2018-07-25 10:58:34 -04:00
Nicole Thomas	030c921914	Merge pull request #48754 from lomeroe/fix-tornado-proxy ... send proxy/ca_cert parameters as strings (not unicode) to tornado httpclient	2018-07-25 10:55:42 -04:00
Daniel Wallace	535fb8f8e7	only do reverse dns lookup on ips for salt-ssh ... Fixes #48676	2018-07-25 09:48:29 -05:00
Nicole Thomas	097eba1b62	Merge pull request #48770 from Ch3LL/update_doc_develop ... Update Saltstack Logo banner on docs.saltstack.com	2018-07-25 10:47:32 -04:00
Nicole Thomas	1eee4b136b	Merge pull request #48769 from Ch3LL/update_doc_2018.3 ... Update Saltstack Logo banner on docs.saltstack.com	2018-07-25 10:47:19 -04:00