juju-core

Merge lp://staging/~rogpeppe/juju-core/391-1.14-avoid-allFatal into lp://staging/juju-core/1.14

391-1.14-avoid-allFatal
Merge into 1.14

Proposed by Roger Peppe on 2013-09-13

Status:

Merged

Approved by:

Roger Peppe on 2013-09-13

Approved revision:

no longer in the source branch.

Merged at revision:

1741

Proposed branch:

lp://staging/~rogpeppe/juju-core/391-1.14-avoid-allFatal

Merge into:

lp://staging/juju-core/1.14

Diff against target:

761 lines (+313/-65)

13 files modified

cmd/jujud/agent.go (+21/-0)
cmd/jujud/agent_test.go (+66/-0)
cmd/jujud/machine.go (+14/-8)
cmd/jujud/machine_test.go (+6/-6)
cmd/jujud/unit.go (+2/-2)
juju/testing/conn.go (+48/-36)
state/api/apiclient.go (+5/-4)
state/apiserver/pinger_test.go (+12/-0)
state/state.go (+6/-0)
state/state_test.go (+6/-0)
testing/checkers/set.go (+35/-0)
testing/checkers/set_test.go (+54/-0)
testing/mgo.go (+38/-9)

To merge this branch:

bzr merge lp://staging/~rogpeppe/juju-core/391-1.14-avoid-allFatal

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-09-13	Pending
Review via email: mp+185445@code.staging.launchpad.net

Commit message

cmd/jujud: avoid using allFatal

This is a backport of the https://code.launchpad.net/~rogpeppe/juju-core/384-avoid-allfatal/+merge/184743
now proposed for 1.14, with selected other patches from other revisions
to make it compile.

https://codereview.appspot.com/13696043/

Description of the change

cmd/jujud: avoid using allFatal

This is a backport of the https://code.launchpad.net/~rogpeppe/juju-core/384-avoid-allfatal/+merge/184743
now proposed for 1.14, with selected other patches from other revisions
to make it compile.

https://codereview.appspot.com/13696043/

Revision history for this message

Roger Peppe (rogpeppe) wrote on 2013-09-13:

Reviewers: mp+185445_code.launchpad.net,

Message:
Please take a look.

Description:
cmd/jujud: avoid using allFatal

This is a backport of the
https://code.launchpad.net/~rogpeppe/juju-core/384-avoid-allfatal/+merge/184743
now proposed for 1.14, with selected other patches from other revisions
to make it compile.

https://code.launchpad.net/~rogpeppe/juju-core/391-1.14-avoid-allFatal/+merge/185445

(do not edit description out of merge proposal)

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

Affected files (+315, -65 lines):
   A [revision details]
   M cmd/jujud/agent.go
   M cmd/jujud/agent_test.go
   M cmd/jujud/machine.go
   M cmd/jujud/machine_test.go
   M cmd/jujud/unit.go
   M juju/testing/conn.go
   M state/api/apiclient.go
   M state/apiserver/pinger_test.go
   M state/state.go
   M state/state_test.go
   A testing/checkers/set.go
   A testing/checkers/set_test.go
   M testing/mgo.go