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

Jump to bottom

Change databaseState in longTermRetention.json to longTermRetentionDatabaseState #2693

Merged
merged 29 commits into from
Mar 19, 2018
Merged

Change databaseState in longTermRetention.json to longTermRetentionDatabaseState #2693

Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ef42cfc
Adding API Specs for Long Term Retention V2
trgrie Jan 11, 2018
c3e1246
Remove empty properties and update retention description
trgrie Jan 12, 2018
6a46b46
Description and Entity Name Changes
trgrie Feb 12, 2018
71a7183
Fixing Incorrect Description
trgrie Feb 12, 2018
1ef82da
Remove Conflicting Definitions
trgrie Feb 12, 2018
a45f1c2
Remove Reference to backupLongTermRetentionPolicies.json
trgrie Feb 12, 2018
7aff182
Update ResourceId
trgrie Mar 2, 2018
9e10fc2
Re-Adding LongTermRetentionPolicyGet.json
trgrie Mar 2, 2018
83aeda2
Merge branch 'master' into master
anuchandy Mar 14, 2018
5cbcc1f
Fix Travis CI Errors
trgrie Mar 14, 2018
edaa127
Pulling Jared's readme.md changes and updating LongTermRetentionPolic…
trgrie Mar 14, 2018
c3aa875
Updating more references to BackupLongTermRetentionPolic(y|ies)
trgrie Mar 14, 2018
b98cf6c
Re-adding backupLongTermRetentionPolicies.json
trgrie Mar 14, 2018
3b80fa0
removing .travis.yml that was accidentally added
trgrie Mar 15, 2018
2bbc4d5
Revert "removing .travis.yml that was accidentally added"
trgrie Mar 15, 2018
185575d
Revert "Re-adding backupLongTermRetentionPolicies.json"
trgrie Mar 15, 2018
3e1bb26
undoing accidental .travis.yml
trgrie Mar 15, 2018
66816de
Merge branch 'master' into master
trgrie Mar 15, 2018
1589bf2
Fixing errors in model PR_ONLY=true Travis CI run
trgrie Mar 15, 2018
befb809
Merge branch 'master' of https://github.com/trgrie/azure-rest-api-specs
trgrie Mar 15, 2018
36eb124
Fixing another Travis CI error
trgrie Mar 15, 2018
0f0a1a7
Removing .travis.yml from the change and changing LongTermRetentionPo…
trgrie Mar 15, 2018
20cac86
resetting backupLongTermRetentionPolicies.json
trgrie Mar 15, 2018
68173d9
Update more references of LongTermRetentionPolicy to BackupLongTermRe…
trgrie Mar 15, 2018
804026b
updating readme.md comment
trgrie Mar 15, 2018
d9f8bd4
Merge remote-tracking branch 'upstream/master'
trgrie Mar 16, 2018
922cc7b
updating databaseState to longTermRetentionDatabaseState
trgrie Mar 19, 2018
58d3850
Making longTermRetentionDatabaseState a common parameter
trgrie Mar 19, 2018
de2f644
adding parameter location as method to LongTermRetentionDatabaseState…
trgrie Mar 19, 2018
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
62 changes: 20 additions & 42 deletions ...tion/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/longTermRetention.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,20 +168,7 @@
"type": "boolean"
},
{
"name": "databaseState",
"in": "query",
"description": "Whether to query against just live databases, just deleted databases, or all databases.",
"required": false,
"type": "string",
"enum": [
"All",
"Live",
"Deleted"
],
"x-ms-enum": {
"name": "databaseState",
"modelAsString": true
}
"$ref": "#/parameters/LongTermRetentionDatabaseStateParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
Expand Down Expand Up @@ -234,20 +221,7 @@
"type": "boolean"
},
{
"name": "databaseState",
"in": "query",
"description": "Whether to query against just live databases, just deleted databases, or all databases.",
"required": false,
"type": "string",
"enum": [
"All",
"Live",
"Deleted"
],
"x-ms-enum": {
"name": "databaseState",
"modelAsString": true
}
"$ref": "#/parameters/LongTermRetentionDatabaseStateParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
Expand Down Expand Up @@ -306,20 +280,7 @@
"type": "boolean"
},
{
"name": "databaseState",
"in": "query",
"description": "Whether to query against just live databases, just deleted databases, or all databases.",
"required": false,
"type": "string",
"enum": [
"All",
"Live",
"Deleted"
],
"x-ms-enum": {
"name": "databaseState",
"modelAsString": true
}
"$ref": "#/parameters/LongTermRetentionDatabaseStateParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
Expand Down Expand Up @@ -746,6 +707,23 @@
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"LongTermRetentionDatabaseStateParameter": {
"name": "databaseState",
"in": "query",
"description": "Whether to query against just live databases, just deleted databases, or all databases.",
"required": false,
"type": "string",
"enum": [
"All",
"Live",
"Deleted"
],
"x-ms-enum": {
"name": "longTermRetentionDatabaseState",
"modelAsString": true
},
"x-ms-parameter-location": "method"
}
},
"securityDefinitions": {
Expand Down