Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-06-09 15:56:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Fri Jun 9 15:56:31 2017 rev:123 rq:500621 version:3.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-05-10
20:53:19.887022863 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-06-09
15:56:32.223039733 +0200
@@ -1,0 +2,6 @@
+Fri Jun 2 11:34:32 UTC 2017 - kgronl...@suse.com
+
+- medium: history: Revert preference of messages over ha-log.txt (bsc#1031138)
+ * Add 0014-medium-history-Revert-preference-of-messages-over-ha.patch
+
+-------------------------------------------------------------------
New:
----
0014-medium-history-Revert-preference-of-messages-over-ha.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.WoQs7D/_old 2017-06-09 15:56:33.130911593 +0200
+++ /var/tmp/diff_new_pack.WoQs7D/_new 2017-06-09 15:56:33.130911593 +0200
@@ -68,6 +68,8 @@
Patch12: 0012-doc-geo-join-requires-clusters-argument-bsc-1037442.patch
# PATCH-FIX-UPSTREAM: medium: bootstrap: Make arbitrator argument optional
(bsc#1038386)
Patch13: 0013-medium-bootstrap-Make-arbitrator-argument-optional-b.patch
+# PATCH-FIX-UPSTREAM: medium: history: Revert preference of messages over
ha-log.txt (bsc#1031138)
+Patch14: 0014-medium-history-Revert-preference-of-messages-over-ha.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@@ -183,6 +185,7 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
# Force the local time
#
++++++ 0014-medium-history-Revert-preference-of-messages-over-ha.patch ++++++
>From dd7a5db2ab556eb125b73c01e587d855dcb1adc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Fri, 2 Jun 2017 13:24:39 +0200
Subject: [PATCH] medium: history: Revert preference of messages over
ha-log.txt (bsc#1031138)
The best fix to this problem would be to combine all available
log files for a node into a single stream. A temporary improvement
is to prefer ha-log.txt over messages, which should be a better
choice if hb_report selected the correct log file.
Partially reverts 2.3.1-3-g99f2056f.
---
crmsh/history.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmsh/history.py b/crmsh/history.py
index 192563a8..d61e30e2 100644
--- a/crmsh/history.py
+++ b/crmsh/history.py
@@ -18,7 +18,7 @@ from . import utils
from .msg import common_debug, common_warn, common_err, common_error,
common_info, warn_once
-_LOG_FILES = ("messages", "ha-log.txt", "ha-log", "cluster-log.txt",
"journal.log", "pacemaker.log")
+_LOG_FILES = ("ha-log.txt", "messages", "ha-log", "cluster-log.txt",
"journal.log", "pacemaker.log")
#
--
2.12.2
