44f6a131de
- Update to 2016.3.4 see https://docs.saltstack.com/en/latest/topics/releases/2016.3.4.html - Removed Patches, applied upstream * 0008-checksum-validation-when-zypper-pkg.download.patch * 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch * 0010-snapper-execution-module.patch * 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch * 0012-Run-salt-api-as-user-salt-bsc-990029.patch * 0013-Deprecate-status.uptime-one-version-later.patch * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch * 0018-Unit-tests-fixes-for-2016.3.2.patch * 0019-Fix-snapper_test-for-python26.patch * 0020-Integration-tests-fixes-for-2016.3.2.patch * 0021-Fix-pkg.upgrade-for-zypper.patch * 0022-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch * 0023-acl.delfacl-fix-position-of-X-option-to-setfacl.patch * 0024-Change-travis-configuration-file-to-use-salt-toaster.patch * 0025-Adding-dist-upgrade-support-to-zypper-module.patch * 0026-Fix-pkg.latest_version-when-latest-already-installed.patch * 0027-Including-resolver-params-for-Zypper-debug-solver.patch - Added patches * 0008-snapper-execution-module.patch * 0009-fix-salt-summary-to-count-not-responding-minions-cor.patch * 0010-Run-salt-api-as-user-salt-bsc-990029.patch * 0011-Fix-snapper_test-for-python26.patch * 0012-Fix-pkg.upgrade-for-zypper.patch * 0013-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch OBS-URL: https://build.opensuse.org/request/show/438684 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=81
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From 7854a6cd0ddc5a7d51f298e69b54eec09ce97c14 Mon Sep 17 00:00:00 2001
|
|
From: Bo Maryniuk <bo@suse.de>
|
|
Date: Thu, 17 Mar 2016 12:30:23 +0100
|
|
Subject: [PATCH 05/17] Use SHA256 hash type by default
|
|
|
|
---
|
|
conf/master | 2 +-
|
|
conf/minion | 2 +-
|
|
conf/proxy | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/conf/master b/conf/master
|
|
index ee98e51..6ef1c10 100644
|
|
--- a/conf/master
|
|
+++ b/conf/master
|
|
@@ -509,7 +509,7 @@ syndic_user: salt
|
|
#
|
|
# Prior to changing this value, the master should be stopped and all Salt
|
|
# caches should be cleared.
|
|
-#hash_type: md5
|
|
+hash_type: sha256
|
|
|
|
# The buffer size in the file server can be adjusted here:
|
|
#file_buffer_size: 1048576
|
|
diff --git a/conf/minion b/conf/minion
|
|
index 9bc9408..07b706f 100644
|
|
--- a/conf/minion
|
|
+++ b/conf/minion
|
|
@@ -559,7 +559,7 @@
|
|
#
|
|
# Warning: Prior to changing this value, the minion should be stopped and all
|
|
# Salt caches should be cleared.
|
|
-#hash_type: sha256
|
|
+hash_type: sha256
|
|
|
|
# The Salt pillar is searched for locally if file_client is set to local. If
|
|
# this is the case, and pillar data is defined, then the pillar_roots need to
|
|
diff --git a/conf/proxy b/conf/proxy
|
|
index 4e5cc34..8e5dd2d 100644
|
|
--- a/conf/proxy
|
|
+++ b/conf/proxy
|
|
@@ -445,7 +445,7 @@
|
|
#
|
|
# Warning: Prior to changing this value, the minion should be stopped and all
|
|
# Salt caches should be cleared.
|
|
-#hash_type: sha256
|
|
+hash_type: sha256
|
|
|
|
# The Salt pillar is searched for locally if file_client is set to local. If
|
|
# this is the case, and pillar data is defined, then the pillar_roots need to
|
|
--
|
|
2.10.1
|
|
|