Skip to content

Commit 21fe6f8

Browse files
david-msftdavid-msft
authored
Merge pull request #4 from Azure/master
Merge master
2 parents bfd34f2 + 4ac3bbf commit 21fe6f8

File tree

676 files changed

+93924
-2388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

676 files changed

+93924
-2388
lines changed

‎custom-words.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2065,4 +2065,4 @@ checkin
20652065
regionality
20662066
Resource
20672067
Metastores
2068-
2068+
maintenancewindows

‎specification/advisor/resource-manager/readme.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ These settings apply only when `--python` is specified on the command line.
101101
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
102102
Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
103103

104-
``` yaml $(python)
104+
``` yaml $(python) && !$(track2)
105105
python-mode: create
106106
python:
107107
azure-arm: true
@@ -113,13 +113,27 @@ python:
113113
clear-output-folder: true
114114
```
115115

116+
``` yaml $(python) && $(track2)
117+
python-mode: create
118+
azure-arm: true
119+
license-header: MICROSOFT_MIT_NO_VERSION
120+
namespace: azure.mgmt.advisor
121+
package-name: azure-mgmt-advisor
122+
package-version: 9.0.0b1
123+
clear-output-folder: true
124+
```
125+
116126
``` yaml $(python) && $(python-mode) == 'update'
127+
no-namespace-folders: true
128+
output-folder: $(python-sdks-folder)/advisor/azure-mgmt-advisor/azure/mgmt/advisor
117129
python:
118130
no-namespace-folders: true
119131
output-folder: $(python-sdks-folder)/advisor/azure-mgmt-advisor/azure/mgmt/advisor
120132
```
121133

122134
``` yaml $(python) && $(python-mode) == 'create'
135+
basic-setup-py: true
136+
output-folder: $(python-sdks-folder)/advisor/azure-mgmt-advisor
123137
python:
124138
basic-setup-py: true
125139
output-folder: $(python-sdks-folder)/advisor/azure-mgmt-advisor

‎specification/analysisservices/resource-manager/Microsoft.AnalysisServices/preview/2017-08-01-beta/analysisservices.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,6 +1348,57 @@
13481348
}
13491349
}
13501350
},
1351+
"ErrorDetail": {
1352+
"description": "The error detail.",
1353+
"properties": {
1354+
"code": {
1355+
"readOnly": true,
1356+
"type": "string",
1357+
"description": "The error code."
1358+
},
1359+
"message": {
1360+
"readOnly": true,
1361+
"type": "string",
1362+
"description": "The error message."
1363+
},
1364+
"target": {
1365+
"readOnly": true,
1366+
"type": "string",
1367+
"description": "The error target."
1368+
},
1369+
"details": {
1370+
"readOnly": true,
1371+
"type": "array",
1372+
"items": {
1373+
"$ref": "#/definitions/ErrorDetail"
1374+
},
1375+
"description": "The error details."
1376+
},
1377+
"additionalInfo": {
1378+
"readOnly": true,
1379+
"type": "array",
1380+
"items": {
1381+
"$ref": "#/definitions/ErrorAdditionalInfo"
1382+
},
1383+
"description": "The error additional info."
1384+
}
1385+
}
1386+
},
1387+
"ErrorAdditionalInfo": {
1388+
"properties": {
1389+
"type": {
1390+
"readOnly": true,
1391+
"type": "string",
1392+
"description": "The additional info type."
1393+
},
1394+
"info": {
1395+
"readOnly": true,
1396+
"type": "object",
1397+
"description": "The additional info."
1398+
}
1399+
},
1400+
"description": "The resource management error additional info."
1401+
},
13511402
"ErrorResponse": {
13521403
"description": "Describes the format of Error response.",
13531404
"type": "object",
@@ -1363,6 +1414,14 @@
13631414
"message": {
13641415
"description": "Error message indicating why the operation failed.",
13651416
"type": "string"
1417+
},
1418+
"details": {
1419+
"readOnly": true,
1420+
"type": "array",
1421+
"items": {
1422+
"$ref": "#/definitions/ErrorDetail"
1423+
},
1424+
"description": "The error details."
13661425
}
13671426
}
13681427
}

‎specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2016-05-16/analysisservices.json‎

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,57 @@
10981098
},
10991099
"description": "An error response from Operations."
11001100
},
1101+
"ErrorDetail": {
1102+
"description": "The error detail.",
1103+
"properties": {
1104+
"code": {
1105+
"readOnly": true,
1106+
"type": "string",
1107+
"description": "The error code."
1108+
},
1109+
"message": {
1110+
"readOnly": true,
1111+
"type": "string",
1112+
"description": "The error message."
1113+
},
1114+
"target": {
1115+
"readOnly": true,
1116+
"type": "string",
1117+
"description": "The error target."
1118+
},
1119+
"details": {
1120+
"readOnly": true,
1121+
"type": "array",
1122+
"items": {
1123+
"$ref": "#/definitions/ErrorDetail"
1124+
},
1125+
"description": "The error details."
1126+
},
1127+
"additionalInfo": {
1128+
"readOnly": true,
1129+
"type": "array",
1130+
"items": {
1131+
"$ref": "#/definitions/ErrorAdditionalInfo"
1132+
},
1133+
"description": "The error additional info."
1134+
}
1135+
}
1136+
},
1137+
"ErrorAdditionalInfo": {
1138+
"properties": {
1139+
"type": {
1140+
"readOnly": true,
1141+
"type": "string",
1142+
"description": "The additional info type."
1143+
},
1144+
"info": {
1145+
"readOnly": true,
1146+
"type": "object",
1147+
"description": "The additional info."
1148+
}
1149+
},
1150+
"description": "The resource management error additional info."
1151+
},
11011152
"ErrorResponse": {
11021153
"description": "Describes the format of Error response.",
11031154
"type": "object",
@@ -1116,11 +1167,21 @@
11161167
},
11171168
"subCode": {
11181169
"description": "The error sub code",
1119-
"type": "string"
1170+
"type": "integer",
1171+
"format": "int32"
11201172
},
11211173
"httpStatusCode": {
11221174
"description": "The http status code",
1123-
"type": "string"
1175+
"type": "integer",
1176+
"format": "int32"
1177+
},
1178+
"details": {
1179+
"readOnly": true,
1180+
"type": "array",
1181+
"items": {
1182+
"$ref": "#/definitions/ErrorDetail"
1183+
},
1184+
"description": "The error details."
11241185
}
11251186
}
11261187
}

‎specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-07-14/analysisservices.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,6 +1247,57 @@
12471247
},
12481248
"description": "An error response from Operations."
12491249
},
1250+
"ErrorDetail": {
1251+
"description": "The error detail.",
1252+
"properties": {
1253+
"code": {
1254+
"readOnly": true,
1255+
"type": "string",
1256+
"description": "The error code."
1257+
},
1258+
"message": {
1259+
"readOnly": true,
1260+
"type": "string",
1261+
"description": "The error message."
1262+
},
1263+
"target": {
1264+
"readOnly": true,
1265+
"type": "string",
1266+
"description": "The error target."
1267+
},
1268+
"details": {
1269+
"readOnly": true,
1270+
"type": "array",
1271+
"items": {
1272+
"$ref": "#/definitions/ErrorDetail"
1273+
},
1274+
"description": "The error details."
1275+
},
1276+
"additionalInfo": {
1277+
"readOnly": true,
1278+
"type": "array",
1279+
"items": {
1280+
"$ref": "#/definitions/ErrorAdditionalInfo"
1281+
},
1282+
"description": "The error additional info."
1283+
}
1284+
}
1285+
},
1286+
"ErrorAdditionalInfo": {
1287+
"properties": {
1288+
"type": {
1289+
"readOnly": true,
1290+
"type": "string",
1291+
"description": "The additional info type."
1292+
},
1293+
"info": {
1294+
"readOnly": true,
1295+
"type": "object",
1296+
"description": "The additional info."
1297+
}
1298+
},
1299+
"description": "The resource management error additional info."
1300+
},
12501301
"ErrorResponse": {
12511302
"description": "Describes the format of Error response.",
12521303
"type": "object",
@@ -1262,6 +1313,14 @@
12621313
"message": {
12631314
"description": "Error message indicating why the operation failed.",
12641315
"type": "string"
1316+
},
1317+
"details": {
1318+
"readOnly": true,
1319+
"type": "array",
1320+
"items": {
1321+
"$ref": "#/definitions/ErrorDetail"
1322+
},
1323+
"description": "The error details."
12651324
}
12661325
}
12671326
}

‎specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-08-01/analysisservices.json‎

Lines changed: 67 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,11 +1245,13 @@
12451245
},
12461246
"subCode": {
12471247
"description": "The error sub code",
1248-
"type": "string"
1248+
"type": "integer",
1249+
"format": "int32"
12491250
},
12501251
"httpStatusCode": {
12511252
"description": "The http status code",
1252-
"type": "string"
1253+
"type": "integer",
1254+
"format": "int32"
12531255
}
12541256
}
12551257
},
@@ -1360,6 +1362,57 @@
13601362
}
13611363
}
13621364
},
1365+
"ErrorDetail": {
1366+
"description": "The error detail.",
1367+
"properties": {
1368+
"code": {
1369+
"readOnly": true,
1370+
"type": "string",
1371+
"description": "The error code."
1372+
},
1373+
"message": {
1374+
"readOnly": true,
1375+
"type": "string",
1376+
"description": "The error message."
1377+
},
1378+
"target": {
1379+
"readOnly": true,
1380+
"type": "string",
1381+
"description": "The error target."
1382+
},
1383+
"details": {
1384+
"readOnly": true,
1385+
"type": "array",
1386+
"items": {
1387+
"$ref": "#/definitions/ErrorDetail"
1388+
},
1389+
"description": "The error details."
1390+
},
1391+
"additionalInfo": {
1392+
"readOnly": true,
1393+
"type": "array",
1394+
"items": {
1395+
"$ref": "#/definitions/ErrorAdditionalInfo"
1396+
},
1397+
"description": "The error additional info."
1398+
}
1399+
}
1400+
},
1401+
"ErrorAdditionalInfo": {
1402+
"properties": {
1403+
"type": {
1404+
"readOnly": true,
1405+
"type": "string",
1406+
"description": "The additional info type."
1407+
},
1408+
"info": {
1409+
"readOnly": true,
1410+
"type": "object",
1411+
"description": "The additional info."
1412+
}
1413+
},
1414+
"description": "The resource management error additional info."
1415+
},
13631416
"ErrorResponse": {
13641417
"description": "Describes the format of Error response.",
13651418
"type": "object",
@@ -1378,11 +1431,21 @@
13781431
},
13791432
"subCode": {
13801433
"description": "The error sub code",
1381-
"type": "string"
1434+
"type": "integer",
1435+
"format": "int32"
13821436
},
13831437
"httpStatusCode": {
13841438
"description": "The http status code",
1385-
"type": "string"
1439+
"type": "integer",
1440+
"format": "int32"
1441+
},
1442+
"details": {
1443+
"readOnly": true,
1444+
"type": "array",
1445+
"items": {
1446+
"$ref": "#/definitions/ErrorDetail"
1447+
},
1448+
"description": "The error details."
13861449
}
13871450
}
13881451
}

0 commit comments

Comments
 (0)