← Back to branch summary

~dave-cheney/pyjuju/go-state-machine-string

~dave-cheney/pyjuju/go-state-machine-string

Viewing all changes in revision 194.

Committer: Dave Cheney
Date: 2012-06-01 06:48:32 UTC
mfrom: (190.1.5 go)
Revision ID: david.cheney@canonical.com-20120601064832-7i8vtsf2u65bi1f3

merge from trunk

files added:
upstart

upstart/upstart.go

upstart/upstart_test.go

files modified:
cmd/juju/cmd_test.go

cmd/juju/main_test.go

cmd/jujuc/main_test.go

cmd/jujud/initzk_test.go

cmd/jujud/machine_test.go

cmd/jujud/provisioning_test.go

cmd/jujud/unit_test.go

cmd/jujud/util_test.go

environs/config_test.go

environs/dummy/environs.go

environs/dummy/environs_test.go

environs/open_test.go

juju/conn.go

juju/conn_test.go

state/internal_test.go

state/topology.go

testing/zk.go

Show diffs side-by-side

added added

removed removed

cmd/juju/cmd_test.go

cmd/juju/main_test.go

cmd/jujuc/main_test.go

cmd/jujud/initzk_test.go

cmd/jujud/machine_test.go

cmd/jujud/provisioning_test.go

cmd/jujud/unit_test.go

cmd/jujud/util_test.go

environs/config_test.go

environs/dummy/environs.go

environs/dummy/environs_test.go

environs/open_test.go

juju/conn_test.go

state/internal_test.go

state/topology.go

upstart/upstart.go

upstart/upstart_test.go

Older »