From 38125040fe0b778f311e409c9db9caac9d669bc6 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Mar 29 2018 16:52:19 +0000
Subject: bump release to 1.15.1


---

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 6414fa5..3e6023c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -56,7 +56,7 @@ copyright = u'2017, Mike McLean, Mike B, Dennis Gilmore, Mathieu Bridon, Ian McL
 # The short X.Y version.
 version = '1.15'
 # The full version, including alpha/beta/rc tags.
-release = '1.15.0'
+release = '1.15.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/koji.spec b/koji.spec
index e35e1b8..4edc2b8 100644
--- a/koji.spec
+++ b/koji.spec
@@ -31,7 +31,7 @@
 %define release %{baserelease}
 %endif
 Name: koji
-Version: 1.15.0
+Version: 1.15.1
 Release: %{release}%{?dist}
 License: LGPLv2 and GPLv2+
 # koji.ssl libs (from plague) are GPLv2+
@@ -478,6 +478,16 @@ fi
 %endif
 
 %changelog
+* Thu Mar 29 2018 Mike McLean <mikem at redhat.com> - 1.15.1-1
+- Backport fix for CVE-2018-1002150
+- Backport PR#848: use subprocess.Popen instead of subprocess.check_output
+- Backport PR#769: handle None in place of string in buildNotification
+- Backport PR#787: builder: make temp dir to be configured
+- Backport PR#804: hub: fix KeyError in `get_notification_recipients`
+- Backport PR#743: Fix key access mechanism in _build_image
+- Backport PR#812: Fix AttributeError during archive import
+- Backport PR#796: Fix comparison with Enum value
+
 * Mon Dec 18 2017 Mike McLean <mikem at redhat.com> - 1.15.0-1
 - PR#602: don't use /tmp in chroot
 - PR#674: store git commit hash to build.source
diff --git a/setup.py b/setup.py
index a1df06a..943fabe 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ def get_install_requires():
 
 setup(
     name="koji",
-    version="1.15.0",
+    version="1.15.1",
     description=("Koji is a system for building and tracking RPMS. The base"
                  " package contains shared libraries and the command-line"
                  " interface."),