Viewing all changes in revision 2593.2.1.
- Committer: John Arbash Meinel
- Date: 2014-04-09 16:36:12 UTC
- mfrom: (2248.1.15 1.18)
- mto: This revision was merged to the branch mainline in revision 2595.
- Revision ID: john@arbash-meinel.com-20140409163612-kow9g5d3apsjhymi
Merge r2263 from lp:juju-core/1.18.
There are a lot of conflicts due to code that has been removed in trunk,
but they are generally easy to resolve.
There are a lot of conflicts due to code that has been removed in trunk,
but they are generally easy to resolve.
- files modified:
- cmd/juju/addmachine.go
expand all
collapse all
added
removed
