From 64f4cb608ad62c215956d911a367b3a845df4002 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 18 2017 08:29:54 +0000
Subject: Upgrade to 2.15.1


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/doc/contributors.rst b/doc/contributors.rst
index 8ed9c6e..2a73c64 100644
--- a/doc/contributors.rst
+++ b/doc/contributors.rst
@@ -3,26 +3,26 @@ Contributors to pagure
 
 Pagure would be nothing without its contributors.
 
-On May 16, 2017 (release 2.15), the list looks as follow:
+On May 18, 2017 (release 2.15.1), the list looks as follow:
 
 =================  ===========
 Number of commits  Contributor
 =================  ===========
-  5233              Pierre-Yves Chibon <pingou@pingoured.fr>
+  5242              Pierre-Yves Chibon <pingou@pingoured.fr>
    191              Ryan Lerch <rlerch@redhat.com>
    139              farhaanbukhsh <farhaan.bukhsh@gmail.com>
    138              Vivek Anand <vivekanand1101@gmail.com>
     77              Farhaan Bukhsh <farhaan.bukhsh@gmail.com>
     60              Clement Verna <cverna@tutanota.com>
     59              Johan Cwiklinski <johan@x-tnd.be>
+    51              Patrick Uiterwijk <puiterwijk@redhat.com>
     47              Mark Reynolds <mreynolds@redhat.com>
-    47              Patrick Uiterwijk <puiterwijk@redhat.com>
     32              Pradeep CE (cep) <breathingcode@gmail.com>
     30              Lubomír Sedlář <lsedlar@redhat.com>
     22              rahul Bajaj <you@example.com>
     20              Jeremy Cline <jeremy@jcline.org>
     19              Gaurav Kumar <aavrug@gmail.com>
-    18              Matt Prahl <mprahl@redhat.com>
+    19              Matt Prahl <mprahl@redhat.com>
     18              Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
     17              Abhijeet Kasurde <akasurde@redhat.com>
     15              Ralph Bean <rbean@redhat.com>
@@ -61,6 +61,7 @@ Number of commits  Contributor
      2              Rahul Bajaj <rahulrb0509@gmail.com>
      2              Richard Marko <rmarko@fedoraproject.org>
      2              Ricky Elrod <ricky@elrod.me>
+     2              Shengjing Zhu <zsj950618@gmail.com>
      2              Simo Sorce <simo@redhat.com>
      2              William Moreno Reyes <williamjmorenor@gmail.com>
      2              bruno <bruno@wolff.to>
@@ -81,7 +82,6 @@ Number of commits  Contributor
      1              Mathew Robinson <mathew.robinson3114@gmail.com>
      1              Pierre-YvesChibon <pingou@fedoraproject.org>
      1              Robert Bost <rbost@redhat.com>
-     1              Shengjing Zhu <zsj950618@gmail.com>
      1              Snehal Karale <skarale@redhat.com>
      1              Stanislav Laznicka <slaznick@redhat.com>
      1              Stanislav Ochotnicky <sochotnicky@redhat.com>
diff --git a/files/pagure.spec b/files/pagure.spec
index abde011..e0c9aeb 100644
--- a/files/pagure.spec
+++ b/files/pagure.spec
@@ -2,7 +2,7 @@
 %distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 
 Name:               pagure
-Version:            2.15
+Version:            2.15.1
 Release:            1%{?dist}
 Summary:            A git-centered forge
 
@@ -370,6 +370,21 @@ install -m 644 pagure-loadjson/pagure_loadjson.service \
 
 
 %changelog
+* Thu May 18 2017 Pierre-Yves Chibon <pingou@pingoured.fr> - 2.15.1-1
+- Update to 2.15.1
+- Fix the requirements on straight.plugin in the requirements.txt file
+  (Shengjing Zhu)
+- Fix typo in the fedmsg hook so it finds the function where it actually is
+- Fix and increase the logging when merging a PR
+- Fix pushing a merge commit to the original repo
+- Use psutil's Process() instead of looping through all processes (Patrick
+  Uiterwijk)
+- Don't email admins for each PR conflicting
+- Fix/improve our new locking mechanism (Patrick Uiterwijk)
+- Drop making the token required at the database level since pagure-ci doesn't
+  use one (but do flag pull-requests)
+- Fix the watch feature (Matt Prahl)
+
 * Tue May 16 2017 Pierre-Yves Chibon <pingou@pingoured.fr> - 2.15-1
 - Update to 2.15
 - Improve logic in api/issue.py to reduce code duplication (Martin Basti)
diff --git a/pagure/__init__.py b/pagure/__init__.py
index 21fdcab..2c7fc2d 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -12,7 +12,7 @@
 __requires__ = ['SQLAlchemy >= 0.8', 'jinja2 >= 2.4']
 import pkg_resources  # noqa: E402,F401
 
-__version__ = '2.15'
+__version__ = '2.15.1'
 __api_version__ = '0.13'