aim@spicy:~/juju
$ git diff --stat upstream/master 
 apiserver/spaces/spaces.go             |   4 +-
 provider/maas/constraints.go           | 206 +++++++++++++++++++++++++++++++++++++++++++
 provider/maas/constraints_test.go      | 518 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 provider/maas/environ.go               | 164 +++++-----------------------------
 provider/maas/environ_whitebox_test.go | 295 ++++---------------------------------------------------------
 provider/maas/maas_test.go             |   7 +-
 6 files changed, 770 insertions(+), 424 deletions(-)
aim@spicy:~/juju