Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix public swagger issues #6396

Merged
merged 10 commits into from
Jun 26, 2019
Merged

fix public swagger issues #6396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f756788
Modify the public swagger by reference to private swagger
Mar 14, 2019
3015288
Merge remote-tracking branch 'upstream/master'
Apr 23, 2019
2727b7c
Merge remote-tracking branch 'upstream/master'
Apr 25, 2019
047db66
Merge remote-tracking branch 'upstream/master'
May 15, 2019
1a04dc6
Merge remote-tracking branch 'upstream/master'
May 22, 2019
7e6a62e
Merge remote-tracking branch 'upstream/master'
Jun 14, 2019
39e11c9
Merge remote-tracking branch 'upstream/master'
Jun 19, 2019
22f0029
Merge remote-tracking branch 'upstream/master'
Jun 20, 2019
b0ddfd5
modify swagger
Jun 20, 2019
76032c5
Change XxxSetting to XxxSettings in private swagger
Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions ...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,36 +1182,6 @@
}
}
},
"TeradataTableDatasetTypeProperties": {
"description": "Teradata dataset properties.",
"properties": {
"database": {
"type": "object",
"description": "The database name of Teradata. Type: string (or Expression with resultType string)."
},
"table": {
"type": "object",
"description": "The table name of Teradata. Type: string (or Expression with resultType string)."
}
}
},
"TeradataTableDataset": {
"x-ms-discriminator-value": "TeradataTable",
"description": "The Teradata database dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
"typeProperties": {
"description": "Teradata dataset properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/TeradataTableDatasetTypeProperties"
}
}
},
"AzureMySqlTableDataset": {
"x-ms-discriminator-value": "AzureMySqlTable",
"description": "The Azure MySQL database dataset.",
Expand Down
9 changes: 4 additions & 5 deletions ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,10 +937,6 @@
"TeradataLinkedServiceTypeProperties": {
"description": "Teradata linked service properties.",
"properties": {
"connectionString": {
"description": "Teradata ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"server": {
"type": "object",
"description": "Server name for connection. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -969,7 +965,10 @@
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
}
}
},
"required": [
"server"
]
},
"AzureMLLinkedService": {
"x-ms-discriminator-value": "AzureML",
Expand Down
Loading