Fix bad merge conflict resolution

hashicorp · Jun 9, 2017 · 9f362d6 · 9f362d6
1 parent 21f996a
commit 9f362d6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/client/driver/rkt.go b/client/driver/rkt.go
@@ -83,8 +83,8 @@ type RktDriverConfig struct {
 	Volumes          []string            `mapstructure:"volumes"`            // Host-Volumes to mount in, syntax: /path/to/host/directory:/destination/path/in/container
 	InsecureOptions  []string            `mapstructure:"insecure_options"`   // list of args for --insecure-options
 
-	NoOverlay        bool                `mapstructure:"no_overlay"`         // disable overlayfs for rkt run
-	Debug            bool                `mapstructure:"debug"`              // Enable debug option for rkt command
+	NoOverlay bool `mapstructure:"no_overlay"` // disable overlayfs for rkt run
+	Debug     bool `mapstructure:"debug"`      // Enable debug option for rkt command
 }
 
 // rktHandle is returned from Start/Open as a handle to the PID
@@ -159,6 +159,7 @@ func (d *RktDriver) Validate(config map[string]interface{}) error {
 			},
 			"no_overlay": &fields.FieldSchema{
 				Type: fields.TypeBool,
+			},
 			"insecure_options": &fields.FieldSchema{
 				Type: fields.TypeArray,
 			},