From ec14cac78b5e0a91b79126ee943bf00cd78364d7 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Tue, 5 Sep 2017 15:06:52 -0400
Subject: [PATCH] Write release notes for 2.11.0 and bump the version.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
---
 docs/conf.py           |  4 ++--
 docs/release_notes.rst | 43 ++++++++++++++++++++++++++++++++++++++++++
 setup.py               |  2 +-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 0b692cbae9..2d5f0244c6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.10'
+version = '2.11'
 # The full version, including alpha/beta/rc tags.
-release = '2.10.1'
+release = '2.11.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index 9ff3bbdd04..af46a1d92b 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1,6 +1,49 @@
 Release notes
 =============
 
+2.11.0
+------
+
+Features
+^^^^^^^^
+
+* Bodhi now batches non-urgent updates together for less frequent churn. There is a new
+  ``bodhi-dequeue-stable`` CLI that is intended be added to cron that looks for batched updates and
+  moves them to stable
+  (`#1157 <https://github.com/fedora-infra/bodhi/issues/1157>`_).
+
+
+Bugs
+^^^^
+
+* Improved bugtracker linking in markdown input
+  (`#1406 <https://github.com/fedora-infra/bodhi/issues/1406>`_).
+* Don't disable autopush when the update is already requested for stable
+  (`#1570 <https://github.com/fedora-infra/bodhi/issues/1570>`_).
+* There is now a timeout on fetching results from ResultsDB in the backend
+  (`#1597 <https://github.com/fedora-infra/bodhi/issues/1597>`_).
+* Critical path updates now have positive days_to_stable and will only comment about pushing to
+  stable when appropriate
+  (`#1708 <https://github.com/fedora-infra/bodhi/issues/1708>`_).
+
+
+Development improvements
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+* More docblocks have been written.
+
+
+Release contributors
+^^^^^^^^^^^^^^^^^^^^
+
+The following developers contributed to Bodhi 2.11.0:
+
+* Caleigh Runge-Hottman
+* Ryan Lerch
+* Rimsha Khan
+* Randy Barlow
+
+
 2.10.1
 ------
 
diff --git a/setup.py b/setup.py
index 183c26e814..c7ae01638a 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ def get_requirements(requirements_file='requirements.txt'):
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.rst')).read()
-VERSION = '2.10.1'
+VERSION = '2.11.0'
 # Possible options are at https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',