Merge lp://staging/~sinzui/juju-core/inc-1.17.1 into lp://staging/~go-bot/juju-core/trunk

Reviewers: mp+199841_code.launchpad.net,

Message:
Please take a look.

Description:
Increment trunk to 1.17.1

- Increment juju-core devel to 1.17.1
- hush gofmt (golang 1.2); sort the imports.

https://code.launchpad.net/~sinzui/juju-core/inc-1.17.1/+merge/199841

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/44600044/

Affected files (+5, -3 lines):
   A [revision details]
   M scripts/win-installer/setup.iss
   M state/apiserver/client/client.go
   M version/version.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131220155459-3qx6qjkoi509m3z5
+New revision: <email address hidden>

Index: version/version.go
=== modified file 'version/version.go'
--- version/version.go 2013-12-04 15:34:47 +0000
+++ version/version.go 2013-12-20 16:53:57 +0000
@@ -22,7 +22,7 @@
  // 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 = "1.17.0"
+const version = "1.17.1"

  // Current gives the current version of the system. If the file
  // "FORCE-VERSION" is present in the same directory as the running

Index: scripts/win-installer/setup.iss
=== modified file 'scripts/win-installer/setup.iss'
--- scripts/win-installer/setup.iss 2013-12-04 15:34:47 +0000
+++ scripts/win-installer/setup.iss 2013-12-20 16:53:57 +0000
@@ -2,7 +2,7 @@
  ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

  #define MyAppName "Juju"
-#define MyAppVersion "1.17.0"
+#define MyAppVersion "1.17.1"
  #define MyAppPublisher "Canonical, Ltd"
  #define MyAppURL "http://juju.ubuntu.com/"
  #define MyAppExeName "juju.exe"

Index: state/apiserver/client/client.go
=== modified file 'state/apiserver/client/client.go'
--- state/apiserver/client/client.go 2013-12-20 14:47:10 +0000
+++ state/apiserver/client/client.go 2013-12-20 16:56:35 +0000
@@ -18,8 +18,8 @@
   "launchpad.net/juju-core/charm"
   "launchpad.net/juju-core/environs"
   "launchpad.net/juju-core/environs/config"
+ coreerrors "launchpad.net/juju-core/errors"
   jujuerrors "launchpad.net/juju-core/errors"
- coreerrors "launchpad.net/juju-core/errors"
   "launchpad.net/juju-core/instance"
   "launchpad.net/juju-core/juju"
   "launchpad.net/juju-core/names"

LGTM

On 20 December 2013 17:06, Curtis Hovey <email address hidden> wrote:
> Reviewers: mp+199841_code.launchpad.net,
>
> Message:
> Please take a look.
>
> Description:
> Increment trunk to 1.17.1
>
> - Increment juju-core devel to 1.17.1
> - hush gofmt (golang 1.2); sort the imports.
>
> https://code.launchpad.net/~sinzui/juju-core/inc-1.17.1/+merge/199841
>
> (do not edit description out of merge proposal)
>
>
> Please review this at https://codereview.appspot.com/44600044/
>
> Affected files (+5, -3 lines):
> A [revision details]
> M scripts/win-installer/setup.iss
> M state/apiserver/client/client.go
> M version/version.go
>
>
> Index: [revision details]
> === added file '[revision details]'
> --- [revision details] 2012-01-01 00:00:00 +0000
> +++ [revision details] 2012-01-01 00:00:00 +0000
> @@ -0,0 +1,2 @@
> +Old revision: tarmac-20131220155459-3qx6qjkoi509m3z5
> +New revision: <email address hidden>
>
> Index: version/version.go
> === modified file 'version/version.go'
> --- version/version.go 2013-12-04 15:34:47 +0000
> +++ version/version.go 2013-12-20 16:53:57 +0000
> @@ -22,7 +22,7 @@
> // 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 = "1.17.0"
> +const version = "1.17.1"
>
> // Current gives the current version of the system. If the file
> // "FORCE-VERSION" is present in the same directory as the running
>
>
> Index: scripts/win-installer/setup.iss
> === modified file 'scripts/win-installer/setup.iss'
> --- scripts/win-installer/setup.iss 2013-12-04 15:34:47 +0000
> +++ scripts/win-installer/setup.iss 2013-12-20 16:53:57 +0000
> @@ -2,7 +2,7 @@
> ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
>
> #define MyAppName "Juju"
> -#define MyAppVersion "1.17.0"
> +#define MyAppVersion "1.17.1"
> #define MyAppPublisher "Canonical, Ltd"
> #define MyAppURL "http://juju.ubuntu.com/"
> #define MyAppExeName "juju.exe"
>
>
> Index: state/apiserver/client/client.go
> === modified file 'state/apiserver/client/client.go'
> --- state/apiserver/client/client.go 2013-12-20 14:47:10 +0000
> +++ state/apiserver/client/client.go 2013-12-20 16:56:35 +0000
> @@ -18,8 +18,8 @@
> "launchpad.net/juju-core/charm"
> "launchpad.net/juju-core/environs"
> "launchpad.net/juju-core/environs/config"
> + coreerrors "launchpad.net/juju-core/errors"
> jujuerrors "launchpad.net/juju-core/errors"
> - coreerrors "launchpad.net/juju-core/errors"
> "launchpad.net/juju-core/instance"
> "launchpad.net/juju-core/juju"
> "launchpad.net/juju-core/names"
>
>
>
>
>
> --
> https://code.launchpad.net/~sinzui/juju-core/inc-1.17.1/+merge/199841
> Your team juju hackers is requested to review the proposed merge of lp:~sinzui/juju-core/inc-1.17.1 into lp:juju-core.

Resolved conflicts with Roger's branch.