← Back to branch summary

~rogpeppe/juju-core/039-init-agent-version

~rogpeppe/juju-core/039-init-agent-version

Viewing all changes in revision 421.2.5.

Committer: Roger Peppe
Date: 2012-08-24 15:28:09 UTC
mfrom: (427 juju-core)
mto: This revision was merged to the branch mainline in revision 428.
Revision ID: roger.peppe@canonical.com-20120824152809-55fq67gzh42rouyy

merge trunk

files added:
mstate/confignode.go

mstate/confignode_test.go

testing/mgo.go

testing/mgo_test.go

files removed:
mstate/mgo_test.go

files modified:
cmd/jujud/bootstrap.go

environs/dummy/environs.go

environs/jujutest/livetests.go

mstate/conn_test.go

mstate/open.go

mstate/service.go

mstate/service_test.go

mstate/state.go

mstate/state_test.go

mstate/unit.go

state/open.go

state/state_test.go

testing/zk_test.go

Show diffs side-by-side

added added

removed removed

cmd/jujud/bootstrap.go

environs/dummy/environs.go

environs/jujutest/livetests.go

mstate/confignode.go

mstate/confignode_test.go

mstate/conn_test.go

mstate/mgo_test.go

mstate/service.go

mstate/service_test.go

mstate/state.go

mstate/state_test.go

state/state_test.go

testing/mgo_test.go

testing/zk_test.go

Older »