Viewing all changes in revision 1979.
- Committer: Daniele Stroppa
- Date: 2014-01-08 15:58:10 UTC
- mfrom: (1953.1.231 juju-core)
- Revision ID: daniele.stroppa@joyent.com-20140108155810-xecbwrqkb5i0fyoe
Merging trunk
- files added:
- cloudinit/progress.go
- cloudinit/sshinit
- cmd/charm-admin
- cmd/plugins/juju-backup
- cmd/plugins/juju-restore
- container/factory
- container/testing
- replicaset
- state/api/keymanager
- state/api/keyupdater
- state/apiserver/keymanager
- state/apiserver/keymanager/testing
- state/apiserver/keyupdater
- state/statecmd
- utils/ssh
- utils/ssh/testing
- utils/tailer
- worker/authenticationworker
- files removed:
- worker/deployer/addresser.go
- files renamed:
- environs/manual/agent.go => cloudinit/sshinit/configure.go
- environs/manual/agent_test.go => cloudinit/sshinit/configure_test.go
- environs/manual/detection.go => environs/manual/init.go
- environs/manual/detection_test.go => environs/manual/init_test.go
- provider/maas/environ_test.go => provider/maas/environ_whitebox_test.go
- environs/manual/ssh.go => utils/ssh/ssh.go
- files modified:
- Makefile
expand all
collapse all
added
removed
