Skip to content

Commit

Permalink
Merge pull request #2161 from deniszh/DZ-Renamex-1.1.0-1.1.1
Browse files Browse the repository at this point in the history
Rename release 1.1.0 to 1.1.1 in 1.1.x branch
  • Loading branch information
deniszh authored Dec 19, 2017
2 parents 2d5f15c + 0337750 commit 0456360
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions docs/releases/1_1_0.rst → docs/releases/1_1_1.rst
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]',
Expand Down
2 changes: 1 addition & 1 deletion webapp/graphite/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 0456360

Please sign in to comment.