14ef6d2b51
- splitting out the susemanager integration plugins into their own subpackages. ATM this only contains the zypp plugin to tell susemanager about manually installed packages. - Unit and integration tests fixes for 2016.3.2 Add: * 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 - Prevent pkg.install failure for expired keys (bsc#996455) Add: * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch - Required D-Bus and generating machine ID where it is missing - Fix sphinx crashes when documentation is being generated Add script for documentation update. Add: * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch * update-documentation.sh - Fix pkg.installed refresh repo failure (bsc#993549) Fix salt.states.pkgrepo.management no change failure (bsc#990440) Add: * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch - Deprecate status.uptime one version later Add: OBS-URL: https://build.opensuse.org/request/show/430691 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=77
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From 03732c6879c45596b0a9a0e6500957ec4f9d8415 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/12] 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 8bbe490..118f53b 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 3ba8ba0..8e4dbd0 100644
|
|
--- a/conf/minion
|
|
+++ b/conf/minion
|
|
@@ -542,7 +542,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 7b835e2..ab500f9 100644
|
|
--- a/conf/proxy
|
|
+++ b/conf/proxy
|
|
@@ -435,7 +435,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.9.2
|
|
|