← Back to branch summary

~hduran-8/juju-core/trunk

~hduran-8/juju-core/trunk

Viewing all changes in revision 2263.14.34.

Committer: Roger Peppe
Date: 2014-04-15 16:37:08 UTC
mfrom: (2631.2.3 trunk-plus2)
mto: This revision was merged to the branch mainline in revision 2652.
Revision ID: roger.peppe@canonical.com-20140415163708-wbjzfbwrr983dq7w

merge trunk-plus2

files added:
agent/mongo/upgrade.go

agent/mongo/upgrade_test.go

files modified:
agent/bootstrap_test.go

agent/mongo/mongo.go

agent/mongo/mongo_test.go

cmd/jujud/agent_test.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

replicaset/replicaset.go

replicaset/replicaset_test.go

state/addmachine.go

state/open.go

state/state.go

worker/peergrouper/desired.go

worker/peergrouper/initiate.go

worker/peergrouper/initiate_test.go

worker/uniter/uniter.go

Show diffs side-by-side

added added

removed removed

agent/bootstrap_test.go

agent/mongo/mongo.go

agent/mongo/mongo_test.go

agent/mongo/upgrade.go

agent/mongo/upgrade_test.go

cmd/jujud/agent_test.go

cmd/jujud/bootstrap.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

replicaset/replicaset.go

replicaset/replicaset_test.go

state/addmachine.go

worker/peergrouper/desired.go

worker/peergrouper/initiate.go

worker/peergrouper/initiate_test.go

worker/uniter/uniter.go

Older »