From ccab1aee47e4774adbe45c0424baeee904b1e820 Mon Sep 17 00:00:00 2001
From: Nathan Jenan <nathanj@rancher.com>
Date: Wed, 18 Jul 2018 16:37:23 -0700
Subject: [PATCH] Generated code

---
 .../v3/zz_generated_google_kubernetes_engine_config.go    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/management/v3/zz_generated_google_kubernetes_engine_config.go b/client/management/v3/zz_generated_google_kubernetes_engine_config.go
index 5f2d94c6..8e4141e3 100644
--- a/client/management/v3/zz_generated_google_kubernetes_engine_config.go
+++ b/client/management/v3/zz_generated_google_kubernetes_engine_config.go
@@ -16,14 +16,12 @@ const (
 	GoogleKubernetesEngineConfigFieldLabels                          = "labels"
 	GoogleKubernetesEngineConfigFieldLocations                       = "locations"
 	GoogleKubernetesEngineConfigFieldMachineType                     = "machineType"
+	GoogleKubernetesEngineConfigFieldMaintenanceWindow               = "maintenanceWindow"
 	GoogleKubernetesEngineConfigFieldMasterVersion                   = "masterVersion"
 	GoogleKubernetesEngineConfigFieldNetwork                         = "network"
-<<<<<<< HEAD
-=======
 	GoogleKubernetesEngineConfigFieldNoNetworkPolicy                 = "noNetworkPolicy"
 	GoogleKubernetesEngineConfigFieldNoStackdriverLogging            = "noStackdriverLogging"
 	GoogleKubernetesEngineConfigFieldNoStackdriverMonitoring         = "noStackdriverMonitoring"
->>>>>>> b4785ed...  s code
 	GoogleKubernetesEngineConfigFieldNodeCount                       = "nodeCount"
 	GoogleKubernetesEngineConfigFieldNodeVersion                     = "nodeVersion"
 	GoogleKubernetesEngineConfigFieldProjectID                       = "projectId"
@@ -46,14 +44,12 @@ type GoogleKubernetesEngineConfig struct {
 	Labels                          map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
 	Locations                       []string          `json:"locations,omitempty" yaml:"locations,omitempty"`
 	MachineType                     string            `json:"machineType,omitempty" yaml:"machineType,omitempty"`
+	MaintenanceWindow               string            `json:"maintenanceWindow,omitempty" yaml:"maintenanceWindow,omitempty"`
 	MasterVersion                   string            `json:"masterVersion,omitempty" yaml:"masterVersion,omitempty"`
 	Network                         string            `json:"network,omitempty" yaml:"network,omitempty"`
-<<<<<<< HEAD
-=======
 	NoNetworkPolicy                 bool              `json:"noNetworkPolicy,omitempty" yaml:"noNetworkPolicy,omitempty"`
 	NoStackdriverLogging            bool              `json:"noStackdriverLogging,omitempty" yaml:"noStackdriverLogging,omitempty"`
 	NoStackdriverMonitoring         bool              `json:"noStackdriverMonitoring,omitempty" yaml:"noStackdriverMonitoring,omitempty"`
->>>>>>> b4785ed...  s code
 	NodeCount                       int64             `json:"nodeCount,omitempty" yaml:"nodeCount,omitempty"`
 	NodeVersion                     string            `json:"nodeVersion,omitempty" yaml:"nodeVersion,omitempty"`
 	ProjectID                       string            `json:"projectId,omitempty" yaml:"projectId,omitempty"`