Skip to content

Commit 3473e74

Browse files
yaakoviyunyaakoviyun
committed
Merge pull request #2 from Azure/master
merge from master
2 parents 89ab55d + 3bec100 commit 3473e74

8 files changed

Lines changed: 1125 additions & 376 deletions

File tree

‎arm-datalake-analytics/account/2015-10-01-preview/swagger/account.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"200": {
6161
"description": "",
6262
"schema": {
63-
"$ref": "#/definitions/StorageAccount"
63+
"$ref": "#/definitions/StorageAccountInfo"
6464
}
6565
}
6666
}
@@ -469,7 +469,7 @@
469469
"200": {
470470
"description": "",
471471
"schema": {
472-
"$ref": "#/definitions/DataLakeStoreAccount"
472+
"$ref": "#/definitions/DataLakeStoreAccountInfo"
473473
}
474474
}
475475
}
@@ -671,7 +671,7 @@
671671
"x-ms-pageable": {
672672
"nextLinkName": "nextLink"
673673
},
674-
"x-ms-odata": "#/definitions/StorageAccount"
674+
"x-ms-odata": "#/definitions/StorageAccountInfo"
675675
}
676676
},
677677
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts/{accountName}/DataLakeStoreAccounts/": {
@@ -779,7 +779,7 @@
779779
"x-ms-pageable": {
780780
"nextLinkName": "nextLink"
781781
},
782-
"x-ms-odata": "#/definitions/DataLakeStoreAccount"
782+
"x-ms-odata": "#/definitions/DataLakeStoreAccountInfo"
783783
}
784784
},
785785
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts": {
@@ -1089,7 +1089,7 @@
10891089
},
10901090
"description": "Azure Storage account properties information."
10911091
},
1092-
"StorageAccount": {
1092+
"StorageAccountInfo": {
10931093
"properties": {
10941094
"name": {
10951095
"type": "string",
@@ -1173,7 +1173,7 @@
11731173
},
11741174
"description": "The SAS response that contains the storage account, container and associated SAS token for connection use."
11751175
},
1176-
"DataLakeStoreAccountProperties": {
1176+
"DataLakeStoreAccountInfoProperties": {
11771177
"properties": {
11781178
"suffix": {
11791179
"type": "string",
@@ -1182,14 +1182,14 @@
11821182
},
11831183
"description": "Data Lake Store account properties information."
11841184
},
1185-
"DataLakeStoreAccount": {
1185+
"DataLakeStoreAccountInfo": {
11861186
"properties": {
11871187
"name": {
11881188
"type": "string",
11891189
"description": "Gets or sets the account name of the Data Lake Store account."
11901190
},
11911191
"properties": {
1192-
"$ref": "#/definitions/DataLakeStoreAccountProperties",
1192+
"$ref": "#/definitions/DataLakeStoreAccountInfoProperties",
11931193
"description": "Gets or sets the properties associated with this Data Lake Store account."
11941194
}
11951195
},
@@ -1200,7 +1200,7 @@
12001200
"value": {
12011201
"type": "array",
12021202
"items": {
1203-
"$ref": "#/definitions/StorageAccount"
1203+
"$ref": "#/definitions/StorageAccountInfo"
12041204
},
12051205
"description": "Gets or set the results of the list operation"
12061206
},
@@ -1221,7 +1221,7 @@
12211221
"value": {
12221222
"type": "array",
12231223
"items": {
1224-
"$ref": "#/definitions/DataLakeStoreAccount"
1224+
"$ref": "#/definitions/DataLakeStoreAccountInfo"
12251225
},
12261226
"description": "Gets or set the results of the list operation"
12271227
},
@@ -1289,14 +1289,14 @@
12891289
"dataLakeStoreAccounts": {
12901290
"type": "array",
12911291
"items": {
1292-
"$ref": "#/definitions/DataLakeStoreAccount"
1292+
"$ref": "#/definitions/DataLakeStoreAccountInfo"
12931293
},
12941294
"description": "Gets or sets the list of Data Lake storage accounts associated with this account."
12951295
},
12961296
"storageAccounts": {
12971297
"type": "array",
12981298
"items": {
1299-
"$ref": "#/definitions/StorageAccount"
1299+
"$ref": "#/definitions/StorageAccountInfo"
13001300
},
13011301
"description": "Gets or sets the list of Azure Blob storage accounts associated with this account."
13021302
},
@@ -1320,7 +1320,7 @@
13201320
"AddDataLakeStoreParameters": {
13211321
"properties": {
13221322
"properties": {
1323-
"$ref": "#/definitions/DataLakeStoreAccountProperties",
1323+
"$ref": "#/definitions/DataLakeStoreAccountInfoProperties",
13241324
"description": "Gets or sets the properties for the Data Lake Store account being added."
13251325
}
13261326
},

‎arm-datalake-analytics/job/2015-10-01-preview/swagger/job.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"/Jobs/{jobIdentity}/GetStatistics": {
2424
"post": {
2525
"tags": [
26-
"Jobs"
26+
"Job"
2727
],
28-
"operationId": "Jobs_GetStatistics",
28+
"operationId": "Job_GetStatistics",
2929
"description": "Gets the job statistics object specified by the job ID.",
3030
"parameters": [
3131

@@ -66,9 +66,9 @@
6666
"/Jobs/{jobIdentity}/GetDebugDataPath": {
6767
"post": {
6868
"tags": [
69-
"Jobs"
69+
"Job"
7070
],
71-
"operationId": "Jobs_GetDebugDataPath",
71+
"operationId": "Job_GetDebugDataPath",
7272
"description": "Gets the U-SQL job debug data information specified by the job ID.",
7373
"parameters": [
7474

@@ -109,9 +109,9 @@
109109
"/BuildJob": {
110110
"post": {
111111
"tags": [
112-
"Jobs"
112+
"Job"
113113
],
114-
"operationId": "Jobs_Build",
114+
"operationId": "Job_Build",
115115
"description": "Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.",
116116
"parameters": [
117117

@@ -154,9 +154,9 @@
154154
"/Jobs/{jobId}": {
155155
"put": {
156156
"tags": [
157-
"Jobs"
157+
"Job"
158158
],
159-
"operationId": "Jobs_Create",
159+
"operationId": "Job_Create",
160160
"description": "Submits the specified job to the specified Data Lake Analytics account for computation.",
161161
"parameters": [
162162

@@ -206,9 +206,9 @@
206206
"/Jobs/{jobIdentity}/CancelJob": {
207207
"post": {
208208
"tags": [
209-
"Jobs"
209+
"Job"
210210
],
211-
"operationId": "Jobs_Cancel",
211+
"operationId": "Job_Cancel",
212212
"description": "Cancels the running job specified by the job ID.",
213213
"parameters": [
214214

@@ -246,9 +246,9 @@
246246
"/Jobs/{jobIdentity}": {
247247
"get": {
248248
"tags": [
249-
"Jobs"
249+
"Job"
250250
],
251-
"operationId": "Jobs_Get",
251+
"operationId": "Job_Get",
252252
"description": "Gets the JobInfo object specified by the job ID.",
253253
"parameters": [
254254

@@ -289,9 +289,9 @@
289289
"/Jobs": {
290290
"get": {
291291
"tags": [
292-
"Jobs"
292+
"Job"
293293
],
294-
"operationId": "Jobs_List",
294+
"operationId": "Job_List",
295295
"description": "Gets the first page of the Data Lake Analytics JobInformation objects within the specified resource group with a link to the next page, if any.",
296296
"parameters": [
297297

0 commit comments

Comments
 (0)
⚡