diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 56b79722f1..cf029099e2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.2.5 +current_version = 2.2.7 commit = True tag = True tag_name = {new_version} diff --git a/CHANGES.yaml b/CHANGES.yaml index 42b58eb542..c48a0dfa8d 100644 --- a/CHANGES.yaml +++ b/CHANGES.yaml @@ -1,3 +1,12 @@ +- 2.2.7: + + - (Fix) Correctly clear cookies when visiting from the storefront. + - (Fix) Exposed applications in bundles no longer halt deployment. + +- 2.2.6: + + - (Fix) Anonymous and demo now connect to the controller. + - 2.2.5: - Enable deploy-target queries to work with new deployment flow. diff --git a/jujugui/static/gui/src/app/app.js b/jujugui/static/gui/src/app/app.js index 0bf5e822be..99c52c8718 100644 --- a/jujugui/static/gui/src/app/app.js +++ b/jujugui/static/gui/src/app/app.js @@ -39,6 +39,7 @@ YUI.add('juju-gui', function(Y) { views = Y.namespace('juju.views'), widgets = Y.namespace('juju.widgets'), d3 = Y.namespace('d3'); + /** * The main app class. * @@ -336,6 +337,7 @@ YUI.add('juju-gui', function(Y) { /** Return the current model unique identifier. + @method _getModelUUID @return {String} The model UUID. */ diff --git a/jujugui/static/gui/src/app/components/deployment-flow/test-deployment-flow.js b/jujugui/static/gui/src/app/components/deployment-flow/test-deployment-flow.js index c50c9a9dd2..753b236a59 100644 --- a/jujugui/static/gui/src/app/components/deployment-flow/test-deployment-flow.js +++ b/jujugui/static/gui/src/app/components/deployment-flow/test-deployment-flow.js @@ -979,7 +979,7 @@ describe('DeploymentFlow', function() { assert.equal(changeState.callCount, 1); }); - it('allow or disallow deployments', function() { + it('allows or disallows deployments', function() { const tests = [{ about: 'no model name', state: {modelName: ''}, diff --git a/manifest.json b/manifest.json index 69c4d8f816..5a69b90d64 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Juju GUI", "manifest_version": 2, - "version": "2.2.5", + "version": "2.2.7", "description": "Manage your Juju environment", "icons": { diff --git a/package.json b/package.json index 35227c0806..a216410984 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Juju Developers", "name": "juju-gui", "description": "Juju GUI build dependencies", - "version": "2.2.5", + "version": "2.2.7", "homepage": "http://launchpad.net/juju-gui", "repository": { "type": "git", diff --git a/setup.py b/setup.py index cee8374928..e31dda46aa 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def parse_requirements(filename): tests_requires = parse_requirements("test-requirements.txt") setup(name='jujugui', - version='2.2.5', + version='2.2.7', description='jujugui', classifiers=[ "Programming Language :: Python",