Merge pull request #2161 from deniszh/DZ-Renamex-1.1.0-1.1.1

Rename release 1.1.0 to 1.1.1 in 1.1.x branch

docs/releases.rst

@@ -5,7 +5,7 @@ Release Notes
  :maxdepth: 1
  :glob:
 
- releases/1_1_0
+ releases/1_1_1
  releases/1_0_2
  releases/1_0_1
  releases/1_0_0

docs/releases/1_1_0.rst → docs/releases/1_1_1.rst

@@ -1,17 +1,17 @@
-.. _1-1-0:
+.. _1-1-1:
 
-1.1.0
+1.1.1
 ===========================
 *12/21/2017*
 
-Graphite 1.1.0 is now available! This marks another major milestone on Graphite's releases.
+Graphite 1.1.1 is now available! This marks another major milestone on Graphite's releases.
 
 Source bundles are available from GitHub:
 
-* https://github.com/graphite-project/graphite-web/archive/1.1.0.tar.gz
-* https://github.com/graphite-project/carbon/archive/1.1.0.tar.gz
-* https://github.com/graphite-project/whisper/archive/1.1.0.tar.gz
-* https://github.com/graphite-project/carbonate/archive/1.1.0.tar.gz
+* https://github.com/graphite-project/graphite-web/archive/1.1.1.tar.gz
+* https://github.com/graphite-project/carbon/archive/1.1.1.tar.gz
+* https://github.com/graphite-project/whisper/archive/1.1.1.tar.gz
+* https://github.com/graphite-project/carbonate/archive/1.1.1.tar.gz
 
 Graphite can also be installed from `PyPI <http://pypi.python.org/>`_ via
 `pip <http://www.pip-installer.org/en/latest/index.html>`_. PyPI bundles are here:

setup.py

@@ -74,7 +74,7 @@
 try:
  setup(
  name='graphite-web',
- version='1.1.0',
+ version='1.1.1',
  url='http://graphiteapp.org/',
  author='Chris Davis',
  author_email='[email protected]',

webapp/graphite/settings.py

@@ -27,7 +27,7 @@
 
 
 GRAPHITE_WEB_APP_SETTINGS_LOADED = False
-WEBAPP_VERSION = '1.1.0'
+WEBAPP_VERSION = '1.1.1'
 DEBUG = False
 JAVASCRIPT_DEBUG = False