Merge "Get ppa:maas/next, add eth1 on controller, other minor edits"
authorNarinder Gupta <narinder.gupta@canonical.com>
Sat, 5 Dec 2015 02:05:21 +0000 (02:05 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sat, 5 Dec 2015 02:05:21 +0000 (02:05 +0000)

Trivial merge