Viewing all changes in revision 1754.3.12.
- Committer: John Arbash Meinel
- Date: 2013-09-15 07:36:52 UTC
- mfrom: (1817 juju-core)
- mto: This revision was merged to the branch mainline in revision 1882.
- Revision ID: john@arbash-meinel.com-20130915073652-80jnupeguvr1klea
Merge trunk, resolve conflicts
- files added:
- agent/format-1.16.go
- environs/sshstorage
- environs/tools/testing
- scripts/win-installer
- state/api/logger
- state/apiserver/logger
- files removed:
- environs/config/interface.go
- worker/apiuniter
- worker/apiuniter/charm
- worker/apiuniter/debug
- worker/apiuniter/hook
- worker/apiuniter/jujuc
- worker/apiuniter/relation
- files modified:
- .lbox.check
expand all
collapse all
added
removed
scripts/win-installer/juju-55.bmp
scripts/win-installer/juju-wizard-side.bmp
