Skip to content

Commit

Permalink
Merge pull request #7494 from burton-swan/inc-burton-2.2.0
Browse files Browse the repository at this point in the history
Increment juju to 2.2.0

## Description of change
Version update for Juju 2.2-rc3 release.

## QA steps
Check with juju version once the new build is done.

## Documentation changes
N/A

## Bug reference
N/A
  • Loading branch information
jujubot committed Jun 13, 2017
2 parents 6e95230 + 6d83584 commit a07e398
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/win-installer/setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Juju"
#define MyAppVersion "2.2-rc3"
#define MyAppVersion "2.2.0"
#define MyAppPublisher "Canonical, Ltd"
#define MyAppURL "http://jujucharms.com/"
#define MyAppExeName "juju.exe"
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: juju
version: 2.2-rc3
version: 2.2.0
summary: juju client
description: Through the use of charms, juju provides you with shareable, re-usable, and repeatable expressions of devops best practices.
confinement: classic
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
// The presence and format of this constant is very important.
// The debian/rules build recipe uses this value for the version
// number of the release package.
const version = "2.2-rc3"
const version = "2.2.0"

// The version that we switched over from old style numbering to new style.
var switchOverVersion = semversion.MustParse("1.19.9")
Expand Down

0 comments on commit a07e398

Please sign in to comment.