98024 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	49afc328b5	Merge branch '2018.3' into 'fluorine' ... Conflicts: - .github/CODEOWNERS	2018-09-07 16:21:13 -04:00
rallytime	a00aba9192	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-09-07 16:19:19 -04:00
rallytime	de80bda813	Fix docstring + import order, move pylint disable to own line	2018-09-07 16:10:06 -04:00
Ch3LL	f55f84d1f1	Skip reverse patch integration tests for version <2.6.1	2018-09-07 15:50:43 -04:00
Nicole Thomas	8b971e5e5a	Merge pull request #49533 from silenius/2018.3.3 ... [cherry-pick] Optimize postgres groups management	2018-09-07 14:58:56 -04:00
Nicole Thomas	6bd8781c13	Merge pull request #49540 from cbosdo/fluorine-backport ... Fluorine backport of pr #49510	2018-09-07 14:43:53 -04:00
Nicole Thomas	5d267a2db9	Merge pull request #49547 from rallytime/bp-49518 ... Back-port #49518 to 2017.7	2018-09-07 14:21:49 -04:00
Nicole Thomas	e3ee00132a	Merge pull request #49544 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-09-07 14:20:06 -04:00
Nicole Thomas	1a41b473ce	Merge pull request #49543 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-07 14:19:31 -04:00
Gareth J. Greenaway	4d865b4b9e	Merge pull request #49560 from rallytime/pkgng-fix ... [2017.7.8] Use correct path for is_true function	2018-09-07 09:31:35 -07:00
Erik Johnson	5125a553f1	Un-skip and update test ... This was skipped long ago and it really shouldn't need to be anymore. This also rewrites the test to be a bit more robust.	2018-09-07 11:03:22 -05:00
Nicole Thomas	baafd6ec85	Merge pull request #49487 from garethgreenaway/49452_collections_abc ... [2018.3] Swapping out collections imports	2018-09-07 11:36:03 -04:00
Daniel A. Wozniak	abc9c1acb5	Fix linter issues	2018-09-07 08:03:29 -07:00
Daniel A. Wozniak	8e42384342	Fix multiple issues in x509 module and state ... Adding a regression test for #49008 and patching the x509 module and state to make the test pass.	2018-09-07 07:46:10 -07:00
Daniel A. Wozniak	2a521586db	Fix encoding issues in file and x509 states	2018-09-07 07:46:10 -07:00
Daniel A. Wozniak	49a6da7dfd	Fix map file loading on windows ... Prevent exceptions on windows from lines trying to be decoded/encoded to ascii	2018-09-07 07:46:10 -07:00
rallytime	f3e153443a	[2017.7.8] Use correct path for is_true function ... `data.py` does not exist in the salt/utils/ dir in the 2017.7 branch. We need to use the old path. This occurred from a backport and I missed the path change.	2018-09-07 10:44:30 -04:00
Nicole Thomas	49480710a6	Merge pull request #49549 from rallytime/codeowners-duplicate ... Remove duplicate comment in CODEOWNERS file	2018-09-07 09:42:09 -04:00
rallytime	393bc0fb59	Fix doc build errors in saltnado documentation	2018-09-07 09:39:34 -04:00
Žygis Škulteckis	e1e5cf1c2a	Make sdb.delete() actually call a delete in Redis ... Looks like this was missed when copy-pasting the sdb.get() method.	2018-09-07 11:38:11 +08:00
Gareth J. Greenaway	202da7a94f	Merge pull request #49550 from rallytime/bp-49548 ... Back-port #49548 to 2018.3.3	2018-09-06 17:36:04 -07:00
Erik Johnson	1adbde0147	Remove redundant execution in salt-call ... Pull #48344 added logic to salt-call which runs the desired function using all of the executors, or just the direct_call one if none are configured. However, the previous code which ran the function was not removed, which results in the function being run twice. This removes the (now) redundant function call.	2018-09-06 18:38:01 -05:00
Daniel Wozniak	06935e9211	Merge pull request #49528 from dwoz/mergetests ... Fix merge wart	2018-09-06 16:12:38 -07:00
Gareth J. Greenaway	3298e70607	Merge pull request #49548 from garethgreenaway/1075_disable_boto_tests_part_deux ... [2018.3] Disabling State boto tests for Python 3.7+	2018-09-06 14:50:09 -07:00
Gareth J. Greenaway	180692ccee	Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. This PR is disabling the tests in the test_boto_vpc state tests.	2018-09-06 17:21:33 -04:00
rallytime	4b257d298a	Remove duplicate comment in CODEOWNERS file	2018-09-06 16:55:16 -04:00
Gareth J. Greenaway	2fb3ef7195	Merge branch '2018.3' into 49452_collections_abc	2018-09-06 13:24:39 -07:00
Gareth J. Greenaway	0f5191ef7e	Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. This PR is disabling the tests in the test_boto_vpc state tests.	2018-09-06 12:34:47 -07:00
rallytime	4bb09f7910	Skip service module integration tests on CentOS 7 ... These are occassionally killing the SSH connection in our Jenkins tests. Let's skip them for now until we can delve more deeply into this.	2018-09-06 14:33:03 -04:00
rallytime	0412c5654e	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-09-06 12:20:52 -04:00
Cédric Bosdonnat	ddaa2ef616	virt: disk target device depends on the bus ... Not all disk target devices should start with 'vd' for non-vmware hypervisors. Map the bus type to the right device name prefix. While at it, also make sure the disks are created right for xen. Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com>	2018-09-06 18:18:18 +02:00
Cédric Bosdonnat	a4d67e9f98	virt: allow defining the VM type and arch when creating it ... Some hypervisors can handle several CPU architectures or have different virtualization types. This is reflected in libvirt by the OS type (badly named, indeed) and the arch value. Allow users to set them when creating a VM using either virt.init or virt.running. Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com>	2018-09-06 18:18:11 +02:00
Nicole Thomas	cae2d61568	Merge pull request #49542 from twangboy/fix_osx_build_3 ... Update openssl	2018-09-06 12:11:33 -04:00
Nicole Thomas	92369f06f6	Merge pull request #49541 from twangboy/fix_osx_build_2 ... Remove trusted host switches	2018-09-06 12:11:14 -04:00
twangboy	fe02b2276f	Add 1.0.2p shasum file	2018-09-06 10:08:46 -06:00
rallytime	cf508a4a50	Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/opt.txt - requirements/tests.txt - salt/modules/win_service.py - tests/integration/states/test_service.py	2018-09-06 12:08:01 -04:00
twangboy	5f06dc2762	Fix issues with osx build scripts on 2018.3.3 ... Upgrade openssl to 1.0.2p	2018-09-06 10:05:58 -06:00
Nicole Thomas	d9f09da5d9	Merge pull request #49536 from rallytime/bp-49524 ... Back-port #49524 to 2018.3.3	2018-09-06 12:00:00 -04:00
twangboy	750d3fa29e	Remove trusted host switches	2018-09-06 09:59:46 -06:00
Nicole Thomas	cb934bf0b6	Merge pull request #49535 from Ch3LL/skip_pip_mac ... Skip test_virt and pip_state requirements tests on macosx	2018-09-06 11:59:37 -04:00
Pablo Suárez Hernández	cf27069dcb	Fix some pylint issues	2018-09-06 16:49:36 +01:00
Nicole Thomas	397296f088	Merge pull request #49539 from twangboy/fix_osx_build_2 ... Fix issues with build script on OSX	2018-09-06 11:49:35 -04:00
twangboy	6b42e73ee9	Fix issues with build script on OSX ... Upgrade openSSL to 1.0.2p Upgrade six to 1.11	2018-09-06 09:37:24 -06:00
Dmitry Kuzmenko	7eb8d6c374	Postgress module unit test fix.	2018-09-06 17:28:04 +02:00
Nicole Thomas	bbc8c80c77	Merge pull request #49513 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-09-06 10:07:26 -04:00
Nicole Thomas	c3468250f4	Merge pull request #49521 from terminalmage/fix-splay-executor ... Fix _get_hash in splay executor	2018-09-06 10:06:53 -04:00
Nicole Thomas	75a3b52215	Merge pull request #49527 from terminalmage/remove-special-envs-handling ... Remove special handling for file_envs fileserver func	2018-09-06 10:03:05 -04:00
Nicole Thomas	3f7c89cc14	Merge pull request #49526 from terminalmage/fix-backends-error-logging ... Prevent lookup error when trying to lookup fileserver function from LazyDict	2018-09-06 10:01:29 -04:00
Gareth J. Greenaway	9e7203e08a	Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests.	2018-09-06 09:36:35 -04:00
Nicole Thomas	bf939f9811	Merge pull request #49524 from garethgreenaway/1075_disable_boto_tests ... [2018.3] Disable boto tests under 3.7	2018-09-06 09:35:18 -04:00