94449 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	f4288a8616	Merge pull request #47869 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-05-30 09:44:15 -04:00
Nicole Thomas	9bfac036c1	Merge pull request #47878 from rallytime/develop-lint ... Whitespace fix	2018-05-29 18:23:03 -04:00
rallytime	1ad8f6711b	Whitespace fix	2018-05-29 16:33:14 -04:00
Daniel Wallace	cf1e5d4c25	Merge pull request #47742 from nickgarber/develop__wip-issue-40975-read-salt-cloud-maps-from-the-pillar ... [WIP] feat: read Salt-Cloud Maps from the Pillar	2018-05-29 12:37:48 -05:00
rallytime	d9096653f7	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/cloud/__init__.py - tests/integration/cloud/providers/test_ec2.py - tests/support/paths.py	2018-05-29 11:28:06 -04:00
Daniel Wallace	45da45f636	Merge pull request #47372 from gtmanfred/grains ... Allow for passing in previously compiled grains to custom grain modules	2018-05-29 10:06:50 -05:00
Nicole Thomas	5e13488d11	Merge pull request #46459 from ixs/hypervisor_version ... New grains fetching detailed hypervisor info for Xen domains	2018-05-29 10:42:50 -04:00
Nicole Thomas	61561a8279	Merge pull request #47221 from azelezni/fix-boto_ec2-network_interfaces ... Fix boto_ec2 unused parameter "network_interfaces"	2018-05-29 10:41:34 -04:00
Nicole Thomas	33805f20be	Merge pull request #47818 from eradman/xld ... Only try monkey patching lxd if it is available	2018-05-29 10:31:37 -04:00
Nicole Thomas	11e73541cc	Merge pull request #47837 from rares-pop/dev/iepopr/populate-productname-on-arm ... Populate productname grain on ARM Linux	2018-05-29 10:25:12 -04:00
Nicole Thomas	4cf5729fa2	Merge pull request #47845 from eradman/virt_grain ... Don't issue warning if virt-what is not installed	2018-05-29 10:20:28 -04:00
Eric Radman	2a84a1c47f	Only try monkey-patching lxd if it is available ... And use more common HAS_{LIB} naming convention	2018-05-26 03:39:47 -04:00
Daniel Wallace	30c96f5c8e	Merge pull request #47832 from cbosdo/virt-fixes ... Virt fixes	2018-05-25 20:54:54 -05:00
Daniel Wallace	c4d828c986	Merge pull request #47850 from rallytime/swarm-autodoc ... Fix autodoc for new swarm module	2018-05-25 20:53:16 -05:00
Nicole Thomas	30b31c5db5	Merge pull request #47800 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-25 21:17:40 -04:00
rallytime	467c8fa45c	Fix autodoc for new swarm module ... A misspelling of "members" was causing the docs for the swarm module to not build. This change also fixes a bunch of formatting for RST, a handful of other misspellings, and some small code clean-up. The docs should be building for the swarm execution module with the appropriate doc and CLI example formatting.	2018-05-25 21:07:51 -04:00
Nicole Thomas	6f33e4790e	Merge pull request #47711 from garethgreenaway/beacon_btmp_wtmp_group_support ... [develop] Adding group support in the btmp and wtmp beacons.	2018-05-25 17:07:09 -04:00
Nicole Thomas	3872e34156	Merge pull request #47836 from slivik/fix-zabbix-template-component-order ... Fixes zabbix template components creation order	2018-05-25 16:56:13 -04:00
Nicole Thomas	d6e75fec39	Merge branch 'develop' into hypervisor_version	2018-05-25 16:48:15 -04:00
Nicole Thomas	39b95e0bf9	Merge pull request #47400 from mcd1992/pkiminions_fix ... Added masterless support to utils/minions.py:_pki_minions function	2018-05-25 16:43:12 -04:00
Nicole Thomas	da9eaa1825	Merge pull request #47581 from twangboy/fix_47274 ... Add get_encoding salt util	2018-05-25 16:40:06 -04:00
Nicole Thomas	b860d95b2c	Merge pull request #47726 from gtmanfred/2018.3 ... rename boto to botomod	2018-05-25 16:37:36 -04:00
Nicole Thomas	9acb5473ef	Merge pull request #47821 from jheidbrink/correct_port ... Specify the correct port in socket.connect	2018-05-25 16:34:39 -04:00
Nicole Thomas	6ba96d8c11	Merge pull request #47839 from nicholasmhughes/fix-azure-deploy-to-vnet-in-diff-rg ... Fix Azure RM cloud module network_resource_group handling	2018-05-25 16:33:12 -04:00
rallytime	9e3ce39e8c	Typo: test_type --> text_type	2018-05-25 16:10:52 -04:00
Eric Radman	0aa6483fc7	Don't issue warning of virt-what is not installed ... Salt uses a variety of means to detect platform characteristics, and generally does not need virt-what.	2018-05-25 14:58:22 -04:00
Nick Garber	75eb4d13b0	Merge branch 'develop' into develop__wip-issue-40975-read-salt-cloud-maps-from-the-pillar	2018-05-25 11:23:26 -04:00
rallytime	8877489386	Fix bad merge caught by test in zpool state ... Also fix up some of the comment formatting	2018-05-25 10:47:33 -04:00
Gareth J. Greenaway	f905234668	Merge pull request #47840 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-05-25 07:46:46 -07:00
rallytime	583f25cfbd	Reduce the number of days an issue is stale by 10	2018-05-25 10:28:43 -04:00
nicholasmhughes	af16e50856	fixes #47794 where network_resource_group doesn't behave properly	2018-05-25 10:05:50 -04:00
Nicole Thomas	13cd450394	Merge pull request #47814 from travispaul/fix-pkgin-bug-add-tests ... Bugfixes and unit tests for pkgin module	2018-05-25 09:30:25 -04:00
Nicole Thomas	c69a9a2dd1	Merge pull request #47810 from rmcintosh/fix-linode-plan-selection ... Fix Linode plan selection	2018-05-25 09:27:44 -04:00
Molly Kreis	15f2b9af54	Populate productname grain on ARM Linux ... Populate the productname grain on ARM Linux from the DeviceDesc UBOOT variable Signed-off-by: Molly Kreis <molly.kreis@ni.com>	2018-05-25 16:24:42 +03:00
Aaron	6301b31a85	Merge branch 'develop' into pkiminions_fix	2018-05-25 08:23:32 -05:00
slivik	403746e51a	Fixes zabbix template components creation order	2018-05-25 15:10:53 +02:00
Cédric Bosdonnat	2805340b19	virt: virDomain have XMLDesc rather than getXMLDesc ... The 'typo' was introduced during the recent heaving refactoring of the virt module. Mind that snapshot objects have getXMLDesc() while domains have XMLDesc() (without the 'get')	2018-05-25 11:12:58 +02:00
Cédric Bosdonnat	3fb34a5b5f	virt: fix start() refactoring error ... start function doesn't actually calls create() function on the domain, the '()' are missing.	2018-05-25 11:12:56 +02:00
rmcintosh	6774602093	better debug message ... also, give Cloud Profile its proper capitalization and some minor formatting consistency updates	2018-05-24 23:35:52 -04:00
rmcintosh	a8c4b2f3b9	Merge branch 'develop' into fix-linode-plan-selection	2018-05-24 14:59:02 -04:00
rmcintosh	77ca3a2a37	Address PR feedback	2018-05-24 14:58:42 -04:00
Travis Paul	3a888ae833	Lint test_pkgin.py	2018-05-25 00:58:12 +08:00
Gareth J. Greenaway	6d6e688d08	Fixing date in unit.beacons.test_btmp_beacon.BTMPBeaconTestCase.test_match_time	2018-05-24 09:57:43 -07:00
Gareth J. Greenaway	56d37e4997	code climate fixes.	2018-05-24 09:57:43 -07:00
Gareth J. Greenaway	3392c8f720	Consolidating duplicate code. Adding additional tests. Fixing some btmp vs wtmp typos.	2018-05-24 09:57:43 -07:00
Gareth J. Greenaway	0cf66c54fb	Removing unnecessary code in validate functions.	2018-05-24 09:57:43 -07:00
Gareth J. Greenaway	55c9be378b	fixing beacons group tests.	2018-05-24 09:57:42 -07:00
Gareth J. Greenaway	3444da55e2	Adding group support in the btmp and wtmp beacons.	2018-05-24 09:57:42 -07:00
Nicole Thomas	ff6600f25e	Merge branch '2018.3' into fix_47274	2018-05-24 12:47:29 -04:00
Nicole Thomas	2019cc8960	Merge pull request #47261 from shtrom/bash-completion-log-level-and-function-cache ... Bash completion log level and function cache	2018-05-24 12:37:11 -04:00