Viewing all changes in revision 359.
- Committer: Frank Mueller
- Date: 2012-08-21 08:48:07 UTC
- mfrom: (354.1.63 juju-core)
- Revision ID: themue@gmail.com-20120821084807-l97cttfvqwa3omge
state: merged trunk to stay up-to-date
- files added:
- cmd/juju/addunit.go
- downloader
- environs/cloudinit
- juju/testing
- trivial
- worker/uniter/charm
- worker/uniter/hook
- worker/uniter/relation
- files removed:
- mstate/error.go
- state/testing
- files renamed:
- cmd/jujud/initzk.go => cmd/jujud/bootstrap.go
- cmd/jujud/initzk_test.go => cmd/jujud/bootstrap_test.go
- environs/ec2/cloudinit.go => environs/cloudinit/cloudinit.go
- environs/ec2/cloudinit_test.go => environs/cloudinit/cloudinit_test.go
- store/http_test.go => testing/http.go
- worker/uniter/hookqueue.go => worker/uniter/relation/hookqueue.go
- worker/uniter/hookqueue_test.go => worker/uniter/relation/hookqueue_test.go
- worker/uniter/relationstate.go => worker/uniter/relation/relation.go
- worker/uniter/relationstate_test.go => worker/uniter/relation/relation_test.go
- files modified:
- cmd/cmd.go
expand all
collapse all
added
removed
