Merge pull request #2506 from deniszh/DZ-1.1.x-prep-1.1.6

preparing 1.1.6 release

docs/conf.py

@@ -87,9 +87,9 @@ def setup(app):
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.5'
+version = '1.1.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.5'
+release = '1.1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -78,7 +78,7 @@ def read(fname):
 try:
     setup(
       name='graphite-web',
-      version='1.1.5',
+      version='1.1.6',
       url='http://graphiteapp.org/',
       author='Chris Davis',
       author_email='[email protected]',

webapp/graphite/settings.py

@@ -28,7 +28,7 @@
 
 
 GRAPHITE_WEB_APP_SETTINGS_LOADED = False
-WEBAPP_VERSION = '1.1.5'
+WEBAPP_VERSION = '1.1.6'
 DEBUG = False
 JAVASCRIPT_DEBUG = False