juju-core

Merge lp://staging/~wallyworld/juju-core/gwacl-231 into lp://staging/~go-bot/juju-core/trunk

gwacl-231
Merge into trunk

Proposed by Ian Booth on 2014-02-11

Status:

Superseded

Proposed branch:

lp://staging/~wallyworld/juju-core/gwacl-231

Merge into:

lp://staging/~go-bot/juju-core/trunk

Diff against target:

439 lines (+271/-3) (has conflicts)

13 files modified

cmd/juju/destroymachine.go (+1/-1)
cmd/juju/destroymachine_test.go (+4/-0)
cmd/juju/destroyservice.go (+1/-0)
cmd/juju/main_test.go (+2/-0)
cmd/jujud/bootstrap.go (+4/-0)
dependencies.tsv (+6/-1)
environs/httpstorage/storage.go (+4/-1)
provider/common/bootstrap_test.go (+4/-0)
provider/common/state.go (+90/-0)
provider/common/state_test.go (+141/-0)
scripts/win-installer/setup.iss (+4/-0)
state/apiserver/client/client_test.go (+6/-0)
version/version.go (+4/-0)

Text conflict in cmd/jujud/bootstrap.go
Text conflict in dependencies.tsv
Text conflict in provider/common/bootstrap_test.go
Text conflict in provider/common/state.go
Text conflict in provider/common/state_test.go
Text conflict in scripts/win-installer/setup.iss
Text conflict in state/apiserver/client/client_test.go
Text conflict in version/version.go

To merge this branch:

bzr merge lp://staging/~wallyworld/juju-core/gwacl-231

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-02-11	Pending
Review via email: mp+205697@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2014-02-11.

Description of the change

Update gwacl dependency to rev 231

We need this for a 1.16.6 release.

https://codereview.appspot.com/61800043/

Revision history for this message

Ian Booth (wallyworld) wrote on 2014-02-11:

Reviewers: mp+205697_code.launchpad.net,

Message:
Please take a look.

Description:
Update gwacl dependency to rev 231

We need this for a 1.16.6 release.

https://code.launchpad.net/~wallyworld/juju-core/gwacl-231/+merge/205697

(do not edit description out of merge proposal)

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

Affected files (+106, -39 lines):
   A [revision details]
   M cmd/juju/destroymachine.go
   M cmd/juju/destroymachine_test.go
   M cmd/juju/destroyservice.go
   M cmd/juju/main_test.go
   M cmd/jujud/bootstrap.go
   M dependencies.tsv
   M environs/httpstorage/storage.go
   M provider/common/bootstrap_test.go
   M provider/common/state.go
   M provider/common/state_test.go
   M scripts/win-installer/setup.iss
   M state/apiserver/client/client_test.go
   M state/cleanup.go
   M state/cleanup_test.go
   M version/version.go