Merge pull request #2569 from deniszh/DZ-rel-1.1.7

Release 1.1.7

LICENSE

@@ -187,7 +187,7 @@
  same "printed page" as the copyright notice for easier
  identification within third-party archives.
 
- Copyright 2008-2012 Chris Davis; 2011-2016 The Graphite Project
+ Copyright 2008-2012 Chris Davis; 2011-2020 The Graphite Project
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

docs/conf.py

@@ -85,16 +85,16 @@ def setup(app):
 
 # General information about the project.
 project = u'Graphite'
-copyright = u'2008-2012, Chris Davis; 2011-2017 The Graphite Project'
+copyright = u'2008-2012, Chris Davis; 2011-2020 The Graphite Project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.6'
+version = '1.1.7'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.6'
+release = '1.1.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -80,7 +80,7 @@ def read(fname):
 try:
  setup(
  name='graphite-web',
- version='1.1.6',
+ version='1.1.7',
  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.6'
+WEBAPP_VERSION = '1.1.7'
 DEBUG = False
 JAVASCRIPT_DEBUG = False