Hello community,

here is the log from the commit of package salt for openSUSE:Factory checked in 
at 2018-03-02 21:10:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/salt (Old)
 and      /work/SRC/openSUSE:Factory/.salt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "salt"

Fri Mar  2 21:10:26 2018 rev:72 rq:581637 version:2018.1.99

Changes:
--------
--- /work/SRC/openSUSE:Factory/salt/salt.changes        2018-02-09 
15:48:21.625636471 +0100
+++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes   2018-03-02 
21:10:30.627524983 +0100
@@ -1,0 +2,70 @@
+Thu Mar  1 10:35:18 UTC 2018 - Mihai Dinca <mdi...@suse.de>
+
+- Fix grains containing trailing "\n"
+
+- Added:
+  * fix-grains-with-n.patch
+
+-------------------------------------------------------------------
+Tue Feb 20 10:47:34 UTC 2018 - Mihai Dinca <mdi...@suse.de>
+
+- Remove salt-minion python2 requirement when python3 is default (bsc#1081592)
+
+-------------------------------------------------------------------
+Tue Feb 13 15:17:11 UTC 2018 - Mihai Dinca <mdi...@suse.de>
+
+- Remove-obsolete-unicode-handling-in-pkg.info_installed
+
+- Added:
+  * remove-obsolete-unicode-handling-in-pkg.info_install.patch
+
+-------------------------------------------------------------------
+Fri Feb 09 15:39:08 UTC 2018 - Mihai Dinca <mdi...@suse.de>
+
+- Update to salt-2018.1.99
+
+- Modified:
+  * activate-all-beacons-sources-config-pillar-grains.patch
+  * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
+  * feat-add-grain-for-all-fqdns.patch
+  * fix-bsc-1065792.patch
+  * list_pkgs-add-parameter-for-returned-attribute-selec.patch
+  * run-salt-api-as-user-salt-bsc-1064520.patch
+  * run-salt-master-as-dedicated-salt-user.patch
+
+- Deleted:
+  * python3-compatibility-fix-got-bytes-instead-of-strin.patch
+  * enable-with-salt-version-parameter-for-setup.py-scri.patch
+  * catching-error-when-pidfile-cannot-be-deleted.patch
+  * bugfix-always-return-a-string-list-on-unknown-job-ta.patch
+  * bugfix-the-logic-according-to-the-exact-described-pu.patch
+  * cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch
+  * fix-for-delete_deployment-in-kubernetes-module.patch
+  * fix-salt-master-for-old-psutil.patch
+  * introduce-process_count_max-minion-configuration-par.patch
+  * multiprocessing-minion-option-documentation-fixes.patch
+  * older-logrotate-need-su-directive.patch
+  * return-error-when-gid_from_name-and-group-does-not-e.patch
+  * set-shell-environment-variable-64.patch
+  * split-only-strings-if-they-are-such.patch
+  * use-home-to-get-the-user-home-directory-instead-usin.patch
+  * yumpkg-don-t-use-diff_attr-when-determining-install-.patch
+
+-------------------------------------------------------------------
+Fri Feb 09 15:39:08 UTC 2018 - Jochen Breuer <jbre...@suse.de>
+
+- Fix-epoch-handling-for-Rhel-6-and-7
+- Modified:
+  * yumpkg-don-t-use-diff_attr-when-determining-install-.patch
+
+- Removed:
+  * fix-for-wrong-version-processing.patch
+
+-------------------------------------------------------------------
+Fri Feb 09 15:39:08 UTC 2018 - Jochen Breuer <jbre...@suse.de>
+
+- Restoring-installation-of-packages-for-Rhel-6-7
+Added:
+* yumpkg-don-t-use-diff_attr-when-determining-install-.patch
+
+-------------------------------------------------------------------

Old:
----
  bugfix-always-return-a-string-list-on-unknown-job-ta.patch
  bugfix-the-logic-according-to-the-exact-described-pu.patch
  catching-error-when-pidfile-cannot-be-deleted.patch
  cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch
  enable-with-salt-version-parameter-for-setup.py-scri.patch
  fix-for-delete_deployment-in-kubernetes-module.patch
  fix-salt-master-for-old-psutil.patch
  introduce-process_count_max-minion-configuration-par.patch
  list_pkgs-add-parameter-for-returned-attribute-selec.patch
  multiprocessing-minion-option-documentation-fixes.patch
  older-logrotate-need-su-directive.patch
  python3-compatibility-fix-got-bytes-instead-of-strin.patch
  return-error-when-gid_from_name-and-group-does-not-e.patch
  set-shell-environment-variable-64.patch
  split-only-strings-if-they-are-such.patch
  use-home-to-get-the-user-home-directory-instead-usin.patch
  v2017.7.2.tar.gz
  yumpkg-don-t-use-diff_attr-when-determining-install-.patch

New:
----
  2018.3.0rc1.tar.gz
  _service
  _servicedata
  fix-grains-with-n.patch
  remove-obsolete-unicode-handling-in-pkg.info_install.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ salt.spec ++++++
--- /var/tmp/diff_new_pack.YG3Ahu/_old  2018-03-02 21:10:32.367462413 +0100
+++ /var/tmp/diff_new_pack.YG3Ahu/_new  2018-03-02 21:10:32.375462126 +0100
@@ -52,44 +52,33 @@
 %bcond_with    builddocs
 
 Name:           salt
-Version:        2017.7.2
+Version:        2018.1.99
 Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
 Group:          System/Management
 Url:            http://saltstack.org/
-Source:         https://github.com/saltstack/salt/archive/v%{version}.tar.gz
+# Source:         https://github.com/saltstack/salt/archive/v%{version}.tar.gz
+Source:         https://github.com/saltstack/salt/archive/2018.3.0rc1.tar.gz
 Source1:        README.SUSE
 Source2:        salt-tmpfiles.d
 Source3:        html.tar.bz2
 Source4:        update-documentation.sh
 Source5:        travis.yml
 
-Patch1:        list_pkgs-add-parameter-for-returned-attribute-selec.patch
-Patch2:        use-home-to-get-the-user-home-directory-instead-usin.patch
-Patch3:        multiprocessing-minion-option-documentation-fixes.patch
-Patch4:        introduce-process_count_max-minion-configuration-par.patch
-Patch5:        bugfix-always-return-a-string-list-on-unknown-job-ta.patch
-Patch6:        enable-with-salt-version-parameter-for-setup.py-scri.patch
-Patch7:        run-salt-master-as-dedicated-salt-user.patch
-Patch8:        run-salt-api-as-user-salt-bsc-1064520.patch
-Patch9:        activate-all-beacons-sources-config-pillar-grains.patch
-Patch10:       fix-for-delete_deployment-in-kubernetes-module.patch
-Patch11:       catching-error-when-pidfile-cannot-be-deleted.patch
-Patch12:       avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
-Patch13:       older-logrotate-need-su-directive.patch
-Patch14:       fix-salt-master-for-old-psutil.patch
-Patch15:       split-only-strings-if-they-are-such.patch
-Patch16:       cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch
-Patch17:       python3-compatibility-fix-got-bytes-instead-of-strin.patch
-Patch19:       feat-add-grain-for-all-fqdns.patch
-Patch20:       fix-bsc-1065792.patch
-Patch21:       set-shell-environment-variable-64.patch
-Patch22:       bugfix-the-logic-according-to-the-exact-described-pu.patch
-Patch23:       return-error-when-gid_from_name-and-group-does-not-e.patch
-Patch24:       yumpkg-don-t-use-diff_attr-when-determining-install-.patch
+Patch1:        run-salt-master-as-dedicated-salt-user.patch
+Patch2:        run-salt-api-as-user-salt-bsc-1064520.patch
+Patch3:        activate-all-beacons-sources-config-pillar-grains.patch
+Patch4:        avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
+Patch5:        feat-add-grain-for-all-fqdns.patch
+Patch6:        fix-bsc-1065792.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46006
+Patch7:        remove-obsolete-unicode-handling-in-pkg.info_install.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46278
+Patch8:        fix-grains-with-n.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %{_tmppath}/%{name}-2018.3.0rc1-build
 BuildRequires:  logrotate
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
@@ -531,7 +520,8 @@
 %endif
 
 %prep
-%setup -q -n salt-%{version}
+# %setup -q -n salt-%{version}
+%setup -q -n salt-2018.3.0rc1
 cp %{S:1} .
 cp %{S:5} ./.travis.yml
 %patch1 -p1
@@ -542,21 +532,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
 
 %build
 %if 0%{?build_py2}
@@ -649,6 +624,9 @@
 %if 0%{?suse_version}
 install -Dd -m 0750 %{buildroot}%{_prefix}/lib/zypp/plugins/commit
 %{__install} scripts/suse/zypper/plugins/commit/zyppnotify 
%{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify
+%if 0%{?default_py3}
+sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!/usr/bin/python3=' 
%{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify
+%endif
 %endif
 
 # Install Yum plugins only on RH machines

++++++ _service ++++++
<services>
  <service name="tar_scm" mode="localonly">
    <param name="url">https://github.com/openSUSE/salt-packaging.git</param>
    <param name="subdir">salt</param>
    <param name="filename">package</param>
    <param name="revision">oxygen-rc1</param>
    <param name="scm">git</param>
  </service>
  <service name="extract_file" mode="localonly">
    <param name="archive">*package*.tar</param>
    <param name="files">*/*</param>
  </service>
  <service name="download_url" mode="localonly">
    <param name="host">codeload.github.com</param>
    <param name="path">saltstack/salt/tar.gz/2018.3.0rc1</param>
    <param name="filename">2018.3.0rc1.tar.gz</param>
  </service>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
                <param 
name="url">https://github.com/openSUSE/salt-packaging.git</param>
              <param 
name="changesrevision">b8859cfa3f978b24c1dba6aefa5c37547e09a1b0</param></service></servicedata>++++++
 activate-all-beacons-sources-config-pillar-grains.patch ++++++
--- /var/tmp/diff_new_pack.YG3Ahu/_old  2018-03-02 21:10:32.475458530 +0100
+++ /var/tmp/diff_new_pack.YG3Ahu/_new  2018-03-02 21:10:32.479458386 +0100
@@ -1,4 +1,4 @@
-From 2a88378d88c2f56b152ef048214728995476244a Mon Sep 17 00:00:00 2001
+From 9ba410b90abccad0359ceb96dbc17a357d141e94 Mon Sep 17 00:00:00 2001
 From: Bo Maryniuk <b...@suse.de>
 Date: Tue, 17 Oct 2017 16:52:33 +0200
 Subject: [PATCH] Activate all beacons sources: config/pillar/grains
@@ -8,10 +8,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/salt/minion.py b/salt/minion.py
-index 33cbb8fa0a..10b608cc7a 100644
+index df69d3c7bd..4a30e70be5 100644
 --- a/salt/minion.py
 +++ b/salt/minion.py
-@@ -404,7 +404,7 @@ class MinionBase(object):
+@@ -439,7 +439,7 @@ class MinionBase(object):
          the pillar or grains changed
          '''
          if 'config.merge' in functions:
@@ -21,6 +21,6 @@
                  return self.beacons.process(b_conf, self.opts['grains'])  # 
pylint: disable=no-member
          return []
 -- 
-2.13.6
+2.16.1
 
 

++++++ avoid-excessive-syslogging-by-watchdog-cronjob-58.patch ++++++
--- /var/tmp/diff_new_pack.YG3Ahu/_old  2018-03-02 21:10:32.503457523 +0100
+++ /var/tmp/diff_new_pack.YG3Ahu/_new  2018-03-02 21:10:32.503457523 +0100
@@ -1,4 +1,4 @@
-From 35984b8055beccc94b3bd92b637c5435db822cc9 Mon Sep 17 00:00:00 2001
+From d1150dafa305a15813f7d08756d086814fa1a61f Mon Sep 17 00:00:00 2001
 From: Hubert Mantel <man...@suse.de>
 Date: Mon, 27 Nov 2017 13:55:13 +0100
 Subject: [PATCH] avoid excessive syslogging by watchdog cronjob (#58)
@@ -21,6 +21,6 @@
          /usr/bin/salt-daemon-watcher --with-init & disown
      fi
 -- 
-2.13.6
+2.16.1
 
 

++++++ feat-add-grain-for-all-fqdns.patch ++++++
--- /var/tmp/diff_new_pack.YG3Ahu/_old  2018-03-02 21:10:32.519456947 +0100
+++ /var/tmp/diff_new_pack.YG3Ahu/_new  2018-03-02 21:10:32.523456804 +0100
@@ -1,4 +1,4 @@
-From a1aec4e0d740c179657765ab30475d11f9950174 Mon Sep 17 00:00:00 2001
+From 73727acbfc0bd6a263b0a1464c58f692950b43f7 Mon Sep 17 00:00:00 2001
 From: Michele Bologna <michele.bolo...@suse.com>
 Date: Thu, 14 Dec 2017 18:20:02 +0100
 Subject: [PATCH] Feat: add grain for all FQDNs
@@ -17,14 +17,14 @@
 ---
  salt/grains/core.py                      | 27 +++++++++++++++++++++++++++
  tests/integration/modules/test_grains.py |  1 +
- tests/unit/grains/test_core.py           | 28 ++++++++++++++++++++++++++++
- 3 files changed, 56 insertions(+)
+ tests/unit/grains/test_core.py           |  1 +
+ 3 files changed, 29 insertions(+)
 
 diff --git a/salt/grains/core.py b/salt/grains/core.py
-index a7e1a22d2a..04b73f9120 100644
+index 7d628bccb9..af25097117 100644
 --- a/salt/grains/core.py
 +++ b/salt/grains/core.py
-@@ -1756,6 +1756,33 @@ def append_domain():
+@@ -1890,6 +1890,33 @@ def append_domain():
      return grain
  
  
@@ -59,7 +59,7 @@
      '''
      Return ip address and FQDN grains
 diff --git a/tests/integration/modules/test_grains.py 
b/tests/integration/modules/test_grains.py
-index 7d46315e42..1db90ab532 100644
+index 709f882b45..aa7bd44202 100644
 --- a/tests/integration/modules/test_grains.py
 +++ b/tests/integration/modules/test_grains.py
 @@ -51,6 +51,7 @@ class TestModulesGrains(ModuleCase):
@@ -71,49 +71,18 @@
              'groupname',
              'host',
 diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
-index 6ee4257863..4f1412de76 100644
+index e781fadefe..dba8d082c5 100644
 --- a/tests/unit/grains/test_core.py
 +++ b/tests/unit/grains/test_core.py
-@@ -6,6 +6,7 @@
- # Import Python libs
- from __future__ import absolute_import
+@@ -7,6 +7,7 @@
+ from __future__ import absolute_import, print_function, unicode_literals
+ import logging
  import os
 +import socket
  
  # Import Salt Testing Libs
- from tests.support.mixins import LoaderModuleMockMixin
-@@ -462,3 +463,30 @@ PATCHLEVEL = 3
-         self.assertEqual(os_grains.get('osrelease'), 
os_release_map['osrelease'])
-         self.assertListEqual(list(os_grains.get('osrelease_info')), 
os_release_map['osrelease_info'])
-         self.assertEqual(os_grains.get('osmajorrelease'), 
os_release_map['osmajorrelease'])
-+
-+    @skipIf(not salt.utils.is_linux(), 'System is not Linux')
-+    def test_fqdns_return(self):
-+        '''
-+        test the return for a dns grain. test for issue:
-+        https://github.com/saltstack/salt/issues/41230
-+        '''
-+        reverse_resolv_mock = [('foo.bar.baz', [], ['1.2.3.4']),
-+        ('rinzler.evil-corp.com', [], ['5.6.7.8']),
-+        ('foo.bar.baz', [], ['fe80::a8b2:93ff:fe00:0']),
-+        ('bluesniff.foo.bar', [], ['fe80::a8b2:93ff:dead:beef'])]
-+        ret = {'fqdns': ['rinzler.evil-corp.com', 'foo.bar.baz', 
'bluesniff.foo.bar']}
-+        self._run_fqdns_test(reverse_resolv_mock, ret)
-+
-+    def _run_fqdns_test(self, reverse_resolv_mock, ret):
-+        with patch.object(salt.utils, 'is_windows', 
MagicMock(return_value=False)):
-+            with patch('salt.utils.network.ip_addrs',
-+            MagicMock(return_value=['1.2.3.4', '5.6.7.8'])),\
-+            patch('salt.utils.network.ip_addrs6',
-+            MagicMock(return_value=['fe80::a8b2:93ff:fe00:0', 
'fe80::a8b2:93ff:dead:beef'])):
-+                with patch.object(socket, 'gethostbyaddr', 
side_effect=reverse_resolv_mock):
-+                    fqdns = core.fqdns()
-+                    self.assertEqual(fqdns, ret)
-+
-+if __name__ == '__main__':
-+    from integration import run_tests
-+    run_tests(CoreGrainsTestCase, needs_daemon=False)
+ try:
 -- 
-2.13.6
+2.16.1
 
 

++++++ fix-bsc-1065792.patch ++++++
--- /var/tmp/diff_new_pack.YG3Ahu/_old  2018-03-02 21:10:32.543456084 +0100
+++ /var/tmp/diff_new_pack.YG3Ahu/_new  2018-03-02 21:10:32.551455797 +0100
@@ -1,4 +1,4 @@
-From 7e118cb36bacdc50606512adc562438fcc3257e2 Mon Sep 17 00:00:00 2001
+From 341c175135c555ee1a02f1ce952c95d14fd834fa Mon Sep 17 00:00:00 2001
 From: Bo Maryniuk <b...@suse.de>
 Date: Thu, 14 Dec 2017 16:21:40 +0100
 Subject: [PATCH] Fix bsc#1065792
@@ -8,7 +8,7 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/salt/states/service.py b/salt/states/service.py
-index ff5300df6a..eaa9474f78 100644
+index c5bf3f2d54..a5ec426ec4 100644
 --- a/salt/states/service.py
 +++ b/salt/states/service.py
 @@ -80,6 +80,7 @@ def __virtual__():
@@ -20,6 +20,6 @@
          return __virtualname__
      else:
 -- 
-2.13.6
+2.16.1
 
 

++++++ fix-grains-with-n.patch ++++++
>From 53a6d53b50695baa8004bce5f31a64f7455351f2 Mon Sep 17 00:00:00 2001
From: Mihai Dinca <mdi...@suse.de>
Date: Thu, 1 Mar 2018 11:06:15 +0100
Subject: [PATCH] Fix grains with '\n'

---
 salt/grains/core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/grains/core.py b/salt/grains/core.py
index af25097117..f8e36a895e 100644
--- a/salt/grains/core.py
+++ b/salt/grains/core.py
@@ -2196,7 +2196,7 @@ def _hw_data(osdata):
             if os.path.exists(contents_file):
                 try:
                     with salt.utils.files.fopen(contents_file, 'r') as ifile:
-                        grains[key] = ifile.read()
+                        grains[key] = ifile.read().strip()
                         if key == 'uuid':
                             grains['uuid'] = grains['uuid'].lower()
                 except (IOError, OSError) as err:
-- 
2.16.1


++++++ remove-obsolete-unicode-handling-in-pkg.info_install.patch ++++++
>From 79a840d183975d949d4c4cadf392e0f37dea16a9 Mon Sep 17 00:00:00 2001
From: Mihai Dinca <mdi...@suse.de>
Date: Tue, 13 Feb 2018 16:11:20 +0100
Subject: [PATCH] Remove obsolete unicode handling in pkg.info_installed

---
 salt/modules/zypper.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py
index 51d01c3fc9..659d8858f0 100644
--- a/salt/modules/zypper.py
+++ b/salt/modules/zypper.py
@@ -309,7 +309,7 @@ class _Zypper(object):
         if self.error_msg and not self.__no_raise and not 
self.__ignore_repo_failure:
             raise CommandExecutionError('Zypper command failure: 
{0}'.format(self.error_msg))
 
-        return self._is_xml_mode() and 
dom.parseString(self.__call_result['stdout']) or self.__call_result['stdout']
+        return self._is_xml_mode() and 
dom.parseString(self.__call_result['stdout'].encode('utf-8')) or 
self.__call_result['stdout']
 
 
 __zypper__ = _Zypper()
@@ -482,15 +482,6 @@ def info_installed(*names, **kwargs):
         t_nfo = dict()
         # Translate dpkg-specific keys to a common structure
         for key, value in six.iteritems(pkg_nfo):
-            if isinstance(value, six.string_types):
-                # Check, if string is encoded in a proper UTF-8
-                if six.PY3:
-                    value_ = value.encode('UTF-8', 'ignore').decode('UTF-8', 
'ignore')
-                else:
-                    value_ = value.decode('UTF-8', 'ignore').encode('UTF-8', 
'ignore')
-                if value != value_:
-                    value = kwargs.get('errors', 'ignore') == 'ignore' and 
value_ or 'N/A (invalid UTF-8)'
-                    log.error('Package %s has bad UTF-8 code in %s: %s', 
pkg_name, key, value)
             if key == 'source_rpm':
                 t_nfo['source'] = value
             else:
-- 
2.16.1


++++++ run-salt-api-as-user-salt-bsc-1064520.patch ++++++
--- /var/tmp/diff_new_pack.YG3Ahu/_old  2018-03-02 21:10:32.599454070 +0100
+++ /var/tmp/diff_new_pack.YG3Ahu/_new  2018-03-02 21:10:32.599454070 +0100
@@ -1,4 +1,4 @@
-From 8f81bee8d8929cc4cd30dabc7cbc92d2cba9760e Mon Sep 17 00:00:00 2001
+From d1dfed119ba7e90964451a0859eb9a72c5ff8db8 Mon Sep 17 00:00:00 2001
 From: Christian Lanig <cla...@suse.com>
 Date: Mon, 27 Nov 2017 13:10:26 +0100
 Subject: [PATCH] Run salt-api as user salt (bsc#1064520)
@@ -20,6 +20,6 @@
  ExecStart=/usr/bin/salt-api
  TimeoutStopSec=3
 -- 
-2.13.6
+2.16.1
 
 

++++++ run-salt-master-as-dedicated-salt-user.patch ++++++
--- /var/tmp/diff_new_pack.YG3Ahu/_old  2018-03-02 21:10:32.615453496 +0100
+++ /var/tmp/diff_new_pack.YG3Ahu/_new  2018-03-02 21:10:32.615453496 +0100
@@ -1,4 +1,4 @@
-From 3902fe4183d169808b9d248b9b963926035ba954 Mon Sep 17 00:00:00 2001
+From b69a8f76657ce9e1078a75dcbcb8c3ea0d4a842f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de>
 Date: Wed, 20 Jan 2016 11:01:06 +0100
 Subject: [PATCH] Run salt master as dedicated salt user
@@ -10,7 +10,7 @@
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/conf/master b/conf/master
-index abfc1fa808..bd28f6d406 100644
+index 986898436a..8461101210 100644
 --- a/conf/master
 +++ b/conf/master
 @@ -25,7 +25,8 @@
@@ -42,6 +42,6 @@
        missingok
        rotate 7
 -- 
-2.13.6
+2.16.1
 
 


Reply via email to