From ca054e9f4e495913a7976e31a1263d2ba6f1b34a Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 12 Sep 2018 01:55:57 +0000 Subject: [PATCH] Generated from d2e5203aaa23dc19a85a7242ff35baf7f45a5a54 Merge branch 'master' of https://github.com/ziwa-msft/azure-rest-api-specs --- services/preview/sql/mgmt/2015-05-01-preview/sql/models.go | 6 ++++++ services/preview/sql/mgmt/2017-03-01-preview/sql/models.go | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go b/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go index a0ab829d4887..468b43d65c6c 100644 --- a/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go +++ b/services/preview/sql/mgmt/2015-05-01-preview/sql/models.go @@ -4497,6 +4497,12 @@ type ManagedInstanceProperties struct { VCores *int32 `json:"vCores,omitempty"` // StorageSizeInGB - The maximum storage size in GB. StorageSizeInGB *int32 `json:"storageSizeInGB,omitempty"` + // Collation - Collation of the managed instance. + Collation *string `json:"collation,omitempty"` + // DNSZone - The Dns Zone taht the managed instance is in. + DNSZone *string `json:"dnsZone,omitempty"` + // DNSZonePartner - The resource id of another managed instance whose DNS zone this managed instance will share after creation. + DNSZonePartner *string `json:"dnsZonePartner,omitempty"` } // ManagedInstancesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running diff --git a/services/preview/sql/mgmt/2017-03-01-preview/sql/models.go b/services/preview/sql/mgmt/2017-03-01-preview/sql/models.go index 743c5ffb3a7f..33d49c68c694 100644 --- a/services/preview/sql/mgmt/2017-03-01-preview/sql/models.go +++ b/services/preview/sql/mgmt/2017-03-01-preview/sql/models.go @@ -7836,6 +7836,12 @@ type ManagedInstanceProperties struct { VCores *int32 `json:"vCores,omitempty"` // StorageSizeInGB - The maximum storage size in GB. StorageSizeInGB *int32 `json:"storageSizeInGB,omitempty"` + // Collation - Collation of the managed instance. + Collation *string `json:"collation,omitempty"` + // DNSZone - The Dns Zone taht the managed instance is in. + DNSZone *string `json:"dnsZone,omitempty"` + // DNSZonePartner - The resource id of another managed instance whose DNS zone this managed instance will share after creation. + DNSZonePartner *string `json:"dnsZonePartner,omitempty"` } // ManagedInstancesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running