From 4fec82b6ee4ab60cb2f1bc73ab4c5ee86660e765 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 29 Jun 2015 21:29:58 +0000
Subject: [PATCH] Accepting request 313666 from
 home:oertel:branches:Base:System

- Merge pull request #25 from ptesarik/master
- Enable SysRq dump by default
- Revert "fix /etc/init.d/foo status return code (bnc#931388)"
- Merge pull request #23 from bmwiedemann/master
- fix /etc/init.d/foo status return code (bnc#931388)

OBS-URL: https://build.opensuse.org/request/show/313666
OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=541
---
 aaa_base-13.2+git20150428.4b7d6b6.tar.xz | 3 ---
 aaa_base-13.2+git20150625.4df5033.tar.xz | 3 +++
 aaa_base.changes                         | 9 +++++++++
 aaa_base.spec                            | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 aaa_base-13.2+git20150428.4b7d6b6.tar.xz
 create mode 100644 aaa_base-13.2+git20150625.4df5033.tar.xz

diff --git a/aaa_base-13.2+git20150428.4b7d6b6.tar.xz b/aaa_base-13.2+git20150428.4b7d6b6.tar.xz
deleted file mode 100644
index 31bfe44..0000000
--- a/aaa_base-13.2+git20150428.4b7d6b6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c7908d1ab47eaf7b9fcc0d0b59eb342852c8b3cbf25828bb0910136d3cfe16a
-size 80096
diff --git a/aaa_base-13.2+git20150625.4df5033.tar.xz b/aaa_base-13.2+git20150625.4df5033.tar.xz
new file mode 100644
index 0000000..11cc123
--- /dev/null
+++ b/aaa_base-13.2+git20150625.4df5033.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53645b8d16e47dee42da5d116257bd1eec0e4ad151cc5915bd33848d2a9c322a
+size 80092
diff --git a/aaa_base.changes b/aaa_base.changes
index 2094b87..17eb2c7 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 25 10:26:20 UTC 2015 - ro@suse.com
+
+- Merge pull request #25 from ptesarik/master
+- Enable SysRq dump by default
+- Revert "fix /etc/init.d/foo status return code (bnc#931388)"
+- Merge pull request #23 from bmwiedemann/master
+- fix /etc/init.d/foo status return code (bnc#931388)
+
 -------------------------------------------------------------------
 Tue Apr 28 16:20:16 UTC 2015 - ro@suse.com
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 2e02acc..dafc7bf 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -18,7 +18,7 @@
 
 
 Name:           aaa_base
-Version:        13.2+git20150428.4b7d6b6
+Version:        13.2+git20150625.4df5033
 Release:        0
 Url:            https://github.com/openSUSE/aaa_base
 Provides:       aaa_skel = %{version}-%{release}