Merge branch 'pr-amery-dump' into next-amery

pkg/zones/machine.go

@@ -10,7 +10,7 @@ import (
 // A Machine is a machine on a Zone
 type Machine struct {
 	zone   *Zone
-	logger
+	logger `toml:"-" json:"-" yaml:"-"`
 
 	ID   int    `toml:"id"`
 	Name string `toml:"-" json:"-" yaml:"-"`

pkg/zones/zones.go

@@ -88,7 +88,7 @@ func FilterMachines(m MachineIterator, cond func(*Machine) bool) (Machines, int)
 // Zone represents one zone in a cluster
 type Zone struct {
 	zones  *Zones
-	logger
+	logger `toml:"-" json:"-" yaml:"-"`
 
 	ID   int    `toml:"id"`
 	Name string `toml:"name"`