Skip to content

Commit

Permalink
Merge pull request #2 from Azure/master
Browse files Browse the repository at this point in the history 
merge from master
  • Loading branch information
@yaakoviyun
yaakoviyun committed Jan 18, 2016
2 parents 89ab55d + 3bec100 commit 3473e74
Show file tree
Hide file tree
Showing 8 changed files with 1,125 additions and 376 deletions.
26 changes: 13 additions & 13 deletions arm-datalake-analytics/account/2015-10-01-preview/swagger/account.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/StorageAccount"
"$ref": "#/definitions/StorageAccountInfo"
}
}
}
Expand Down Expand Up @@ -469,7 +469,7 @@
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/DataLakeStoreAccount"
"$ref": "#/definitions/DataLakeStoreAccountInfo"
}
}
}
Expand Down Expand Up @@ -671,7 +671,7 @@
"x-ms-pageable": {
"nextLinkName": "nextLink"
},
"x-ms-odata": "#/definitions/StorageAccount"
"x-ms-odata": "#/definitions/StorageAccountInfo"
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts/{accountName}/DataLakeStoreAccounts/": {
Expand Down Expand Up @@ -779,7 +779,7 @@
"x-ms-pageable": {
"nextLinkName": "nextLink"
},
"x-ms-odata": "#/definitions/DataLakeStoreAccount"
"x-ms-odata": "#/definitions/DataLakeStoreAccountInfo"
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts": {
Expand Down Expand Up @@ -1089,7 +1089,7 @@
},
"description": "Azure Storage account properties information."
},
"StorageAccount": {
"StorageAccountInfo": {
"properties": {
"name": {
"type": "string",
Expand Down Expand Up @@ -1173,7 +1173,7 @@
},
"description": "The SAS response that contains the storage account, container and associated SAS token for connection use."
},
"DataLakeStoreAccountProperties": {
"DataLakeStoreAccountInfoProperties": {
"properties": {
"suffix": {
"type": "string",
Expand All @@ -1182,14 +1182,14 @@
},
"description": "Data Lake Store account properties information."
},
"DataLakeStoreAccount": {
"DataLakeStoreAccountInfo": {
"properties": {
"name": {
"type": "string",
"description": "Gets or sets the account name of the Data Lake Store account."
},
"properties": {
"$ref": "#/definitions/DataLakeStoreAccountProperties",
"$ref": "#/definitions/DataLakeStoreAccountInfoProperties",
"description": "Gets or sets the properties associated with this Data Lake Store account."
}
},
Expand All @@ -1200,7 +1200,7 @@
"value": {
"type": "array",
"items": {
"$ref": "#/definitions/StorageAccount"
"$ref": "#/definitions/StorageAccountInfo"
},
"description": "Gets or set the results of the list operation"
},
Expand All @@ -1221,7 +1221,7 @@
"value": {
"type": "array",
"items": {
"$ref": "#/definitions/DataLakeStoreAccount"
"$ref": "#/definitions/DataLakeStoreAccountInfo"
},
"description": "Gets or set the results of the list operation"
},
Expand Down Expand Up @@ -1289,14 +1289,14 @@
"dataLakeStoreAccounts": {
"type": "array",
"items": {
"$ref": "#/definitions/DataLakeStoreAccount"
"$ref": "#/definitions/DataLakeStoreAccountInfo"
},
"description": "Gets or sets the list of Data Lake storage accounts associated with this account."
},
"storageAccounts": {
"type": "array",
"items": {
"$ref": "#/definitions/StorageAccount"
"$ref": "#/definitions/StorageAccountInfo"
},
"description": "Gets or sets the list of Azure Blob storage accounts associated with this account."
},
Expand All @@ -1320,7 +1320,7 @@
"AddDataLakeStoreParameters": {
"properties": {
"properties": {
"$ref": "#/definitions/DataLakeStoreAccountProperties",
"$ref": "#/definitions/DataLakeStoreAccountInfoProperties",
"description": "Gets or sets the properties for the Data Lake Store account being added."
}
},
Expand Down
28 changes: 14 additions & 14 deletions arm-datalake-analytics/job/2015-10-01-preview/swagger/job.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"/Jobs/{jobIdentity}/GetStatistics": {
"post": {
"tags": [
"Jobs"
"Job"
],
"operationId": "Jobs_GetStatistics",
"operationId": "Job_GetStatistics",
"description": "Gets the job statistics object specified by the job ID.",
"parameters": [

Expand Down Expand Up @@ -66,9 +66,9 @@
"/Jobs/{jobIdentity}/GetDebugDataPath": {
"post": {
"tags": [
"Jobs"
"Job"
],
"operationId": "Jobs_GetDebugDataPath",
"operationId": "Job_GetDebugDataPath",
"description": "Gets the U-SQL job debug data information specified by the job ID.",
"parameters": [

Expand Down Expand Up @@ -109,9 +109,9 @@
"/BuildJob": {
"post": {
"tags": [
"Jobs"
"Job"
],
"operationId": "Jobs_Build",
"operationId": "Job_Build",
"description": "Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.",
"parameters": [

Expand Down Expand Up @@ -154,9 +154,9 @@
"/Jobs/{jobId}": {
"put": {
"tags": [
"Jobs"
"Job"
],
"operationId": "Jobs_Create",
"operationId": "Job_Create",
"description": "Submits the specified job to the specified Data Lake Analytics account for computation.",
"parameters": [

Expand Down Expand Up @@ -206,9 +206,9 @@
"/Jobs/{jobIdentity}/CancelJob": {
"post": {
"tags": [
"Jobs"
"Job"
],
"operationId": "Jobs_Cancel",
"operationId": "Job_Cancel",
"description": "Cancels the running job specified by the job ID.",
"parameters": [

Expand Down Expand Up @@ -246,9 +246,9 @@
"/Jobs/{jobIdentity}": {
"get": {
"tags": [
"Jobs"
"Job"
],
"operationId": "Jobs_Get",
"operationId": "Job_Get",
"description": "Gets the JobInfo object specified by the job ID.",
"parameters": [

Expand Down Expand Up @@ -289,9 +289,9 @@
"/Jobs": {
"get": {
"tags": [
"Jobs"
"Job"
],
"operationId": "Jobs_List",
"operationId": "Job_List",
"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.",
"parameters": [

Expand Down
Loading

0 comments on commit 3473e74

Please sign in to comment.