Viewing all changes in revision 117.
- Committer: Martin Packman
- Date: 2016-04-26 01:22:28 UTC
- mfrom: (1.4.1)
- Revision ID: martin.packman@canonical.com-20160426012228-q9e97cerwfgk5xhk
Merge new upstream source 2.0~beta6 resolving conflicts due to beta5 import
- files added:
- src/github.com/juju/juju/api/hostkeyreporter
- src/github.com/juju/juju/apiserver/hostkeyreporter
- src/github.com/juju/juju/apiserver/presence
- src/github.com/juju/juju/worker/hostkeyreporter
- files removed:
- src/github.com/juju/juju/cmd/juju/space/create.go
- files modified:
- src/github.com/juju/gomaasapi/blockdevice.go
expand all
collapse all
added
removed
