← Back to branch summary

~dave-cheney/juju-core/go-cmd-jujud-firewaller

~dave-cheney/juju-core/go-cmd-jujud-firewaller

Viewing all changes in revision 269.

Committer: Dave Cheney
Date: 2012-07-12 00:06:28 UTC
mfrom: (262.2.35 juju-core)
Revision ID: david.cheney@canonical.com-20120712000628-fmgv6xs23270y17c

merge from trunk

files added:
testing/repo/series/terracotta

testing/repo/series/terracotta/metadata.yaml

testing/repo/series/terracotta/revision

files renamed:
service/ => worker/

files modified:
charm/meta.go

charm/meta_test.go

cmd/jujud/machine.go

cmd/jujud/provisioning.go

store/mgo_test.go

store/store.go

store/store_test.go

worker/firewaller/firewaller_test.go

worker/machiner/machiner_test.go

worker/provisioner/provisioner_test.go

Show diffs side-by-side

added added

removed removed

charm/meta_test.go

cmd/jujud/machine.go

cmd/jujud/provisioning.go

store/mgo_test.go

store/store_test.go

testing/repo/series/terracotta/

testing/repo/series/terracotta/metadata.yaml

testing/repo/series/terracotta/revision

worker/firewaller/firewaller_test.go

worker/machiner/machiner_test.go

worker/provisioner/provisioner_test.go

Older »