From d3a63689557236d86c28853bdb36e64b10d022ea Mon Sep 17 00:00:00 2001
From: Jiri Vymazal <jvymazal@redhat.com>
Date: Dec 05 2018 13:49:04 +0000
Subject: Merge branch 'f29' into f28


---

diff --git a/.gitignore b/.gitignore
index 07ca170..f273991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.37.0.tar.gz
 /rsyslog-8.38.0.tar.gz
 /rsyslog-doc-8.38.0.tar.gz
+/rsyslog-8.39.0.tar.gz
+/rsyslog-doc-8.39.0.tar.gz
diff --git a/rsyslog.spec b/rsyslog.spec
index 44c38b2..220561e 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -8,7 +8,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.38.0
+Version: 8.39.0
 Release: 1%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
@@ -410,7 +410,6 @@ done
 %{_libdir}/rsyslog/lmnetstrms.so
 %{_libdir}/rsyslog/lmnsd_ptcp.so
 %{_libdir}/rsyslog/lmregexp.so
-%{_libdir}/rsyslog/lmstrmsrv.so
 %{_libdir}/rsyslog/lmtcpclt.so
 %{_libdir}/rsyslog/lmtcpsrv.so
 %{_libdir}/rsyslog/lmzlibw.so
@@ -504,6 +503,11 @@ done
 %doc %{rsyslog_docdir}/k8s_container_name.rulebase
 
 %changelog
+* Wed Dec 05 2018 Jiri Vymazal <jvymazal@redhat.com> - 8.39.0-1
+- rebase to upstream version 8.39.0
+  resolves: rhbz#1649081
+  resolves: rhbz#1615014
+
 * Wed Oct 10 2018 Jiri Vymazal <jvymazal@redhat.com> - 8.38.0-1
 - rebase to upstream version 8.38.0
   resolves: rhbz#1632432
diff --git a/sources b/sources
index 79d779b..9677cf9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.38.0.tar.gz) = 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
-SHA512 (rsyslog-doc-8.38.0.tar.gz) = e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
+SHA512 (rsyslog-8.39.0.tar.gz) = f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
+SHA512 (rsyslog-doc-8.39.0.tar.gz) = a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de