Viewing all changes in revision 2307.
- Committer: John Arbash Meinel
- Date: 2014-04-03 09:19:29 UTC
- mfrom: (2293.1.260 juju-core)
- Revision ID: john@arbash-meinel.com-20140403091929-emjbug71ysv2fut1
Merge trunk one more time to come up to date
- files added:
- cmd/envcmd
- worker/apiaddressupdater
- worker/singular
- files removed:
- worker/instancepoller/observer.go
- files renamed:
- cmd/environmentcommand.go => cmd/envcmd/environmentcommand.go
- cmd/environmentcommand_test.go => cmd/envcmd/environmentcommand_test.go
- cmd/export_test.go => cmd/envcmd/export_test.go
- state/api/common/testing/ => state/api/testing/
- worker/uniter/charm/charm.go => worker/uniter/charm/bundles.go
- worker/uniter/charm/charm_test.go => worker/uniter/charm/bundles_test.go
- worker/uniter/charm/deployer.go => worker/uniter/charm/git_deployer.go
- worker/uniter/charm/deployer_test.go => worker/uniter/charm/git_deployer_test.go
- files modified:
- agent/agent.go
expand all
collapse all
added
removed
