From 63e4d4aac71a31d56f2421d595502ad351babfef Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Fri, 7 Sep 2018 13:56:03 -0400
Subject: [PATCH] 2.6.0

---
 docs/CHANGELOG.rst | 12 ++++++++++++
 setup.py           |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index 767062a9..03c50543 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -1,6 +1,18 @@
 Change Log
 ==========
 
+v2.6.0
+------
+* Bugfix: Fix to local builds of components in local git repos prefixed with file:///.
+* Bugfix: Allow module components to use a git ref outside of the master branch.
+  https://pagure.io/fm-orchestrator/pull-request/1008
+* Bugfix: Fix to recording of buildrequires in the modulemd xmd block.
+* RFE: Add a new API to allow importing modules to the MBS DB.  This facilitates
+  management of so-called pseudo-modules.
+* RFE: Module builds stuck in a state for more than a week will now be cleaned up
+  by the poller.
+* RFE: If configured, MBS can now refuse to build modules if their stream is EOL.
+
 v2.5.1
 ------
 * List of filtered RPMs is now generated on backend, so frontend does not query Koji.
diff --git a/setup.py b/setup.py
index ec01a5de..ef540fb5 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ tests_require, _ = read_requirements(path.join(setup_py_path, 'test-requirements
 
 setup(name='module-build-service',
       description='The Module Build Service for Modularity',
-      version='2.5.1',
+      version='2.6.0',
       classifiers=[
           "Programming Language :: Python",
           "Topic :: Software Development :: Build Tools"