From 49fcb474597cbe14a5e942943db29d413dfa2aaf Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 13 Jul 2021 18:48:53 +0000 Subject: [PATCH] CodeGen from PR 15027 in Azure/azure-rest-api-specs Merge bf7e0abc6b9af1e2a3741a715c39c4281806dcdd into 7f3c678432df706220db21d8712d3b1bae6ae1a0 --- schemas/2015-05-01-preview/Microsoft.Sql.json | 3 ++- schemas/2018-06-01-preview/Microsoft.Sql.json | 3 ++- schemas/2019-06-01-preview/Microsoft.Sql.json | 3 ++- schemas/2020-02-02-preview/Microsoft.Sql.json | 3 ++- schemas/2020-08-01-preview/Microsoft.Sql.json | 3 ++- schemas/2020-11-01-preview/Microsoft.Sql.json | 3 ++- schemas/2021-02-01-preview/Microsoft.Sql.json | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/schemas/2015-05-01-preview/Microsoft.Sql.json b/schemas/2015-05-01-preview/Microsoft.Sql.json index ee45813210..7fbc3ae6f7 100644 --- a/schemas/2015-05-01-preview/Microsoft.Sql.json +++ b/schemas/2015-05-01-preview/Microsoft.Sql.json @@ -998,7 +998,8 @@ "enum": [ "None", "SystemAssigned", - "UserAssigned" + "UserAssigned", + "SystemAssigned,UserAssigned" ] }, { diff --git a/schemas/2018-06-01-preview/Microsoft.Sql.json b/schemas/2018-06-01-preview/Microsoft.Sql.json index 3d1402345c..8ffd17d974 100644 --- a/schemas/2018-06-01-preview/Microsoft.Sql.json +++ b/schemas/2018-06-01-preview/Microsoft.Sql.json @@ -1114,7 +1114,8 @@ "enum": [ "None", "SystemAssigned", - "UserAssigned" + "UserAssigned", + "SystemAssigned,UserAssigned" ] }, { diff --git a/schemas/2019-06-01-preview/Microsoft.Sql.json b/schemas/2019-06-01-preview/Microsoft.Sql.json index ed0e1dbc8d..d440a75399 100644 --- a/schemas/2019-06-01-preview/Microsoft.Sql.json +++ b/schemas/2019-06-01-preview/Microsoft.Sql.json @@ -788,7 +788,8 @@ "enum": [ "None", "SystemAssigned", - "UserAssigned" + "UserAssigned", + "SystemAssigned,UserAssigned" ] }, { diff --git a/schemas/2020-02-02-preview/Microsoft.Sql.json b/schemas/2020-02-02-preview/Microsoft.Sql.json index 5679902594..9651f94450 100644 --- a/schemas/2020-02-02-preview/Microsoft.Sql.json +++ b/schemas/2020-02-02-preview/Microsoft.Sql.json @@ -5774,7 +5774,8 @@ "enum": [ "None", "SystemAssigned", - "UserAssigned" + "UserAssigned", + "SystemAssigned,UserAssigned" ] }, { diff --git a/schemas/2020-08-01-preview/Microsoft.Sql.json b/schemas/2020-08-01-preview/Microsoft.Sql.json index 64db6f1613..7ce41dba94 100644 --- a/schemas/2020-08-01-preview/Microsoft.Sql.json +++ b/schemas/2020-08-01-preview/Microsoft.Sql.json @@ -5909,7 +5909,8 @@ "enum": [ "None", "SystemAssigned", - "UserAssigned" + "UserAssigned", + "SystemAssigned,UserAssigned" ] }, { diff --git a/schemas/2020-11-01-preview/Microsoft.Sql.json b/schemas/2020-11-01-preview/Microsoft.Sql.json index 85c0c41a72..7db77793ca 100644 --- a/schemas/2020-11-01-preview/Microsoft.Sql.json +++ b/schemas/2020-11-01-preview/Microsoft.Sql.json @@ -6003,7 +6003,8 @@ "enum": [ "None", "SystemAssigned", - "UserAssigned" + "UserAssigned", + "SystemAssigned,UserAssigned" ] }, { diff --git a/schemas/2021-02-01-preview/Microsoft.Sql.json b/schemas/2021-02-01-preview/Microsoft.Sql.json index b1ad00bd20..dadde224c2 100644 --- a/schemas/2021-02-01-preview/Microsoft.Sql.json +++ b/schemas/2021-02-01-preview/Microsoft.Sql.json @@ -6130,7 +6130,8 @@ "enum": [ "None", "SystemAssigned", - "UserAssigned" + "UserAssigned", + "SystemAssigned,UserAssigned" ] }, {