Skip to content

Commit

Permalink
Merge pull request #36 from stankovski/master
Browse files Browse the repository at this point in the history
Changed scheduler.json interval field from int to duration
  • Loading branch information
stankovski committed Oct 26, 2015
2 parents 13b4beb + ccef0ef commit 28ea011
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions arm-logic/2015-02-01-preview/swagger/logic.json
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@
}
}
},
"x-ms-pageable": true
"x-ms-pageable": { "nextLinkName": "nextLink" }
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/accessKeys/{accessKeyName}": {
Expand Down Expand Up @@ -989,7 +989,7 @@
}
}
},
"x-ms-pageable": true
"x-ms-pageable": { "nextLinkName": "nextLink" }
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/triggers/{triggerName}/histories/{historyName}": {
Expand Down Expand Up @@ -1334,7 +1334,7 @@
"description": "Gets or sets the resource tags."
}
},
"x-ms-external": true
"x-ms-azure-resource": true
},
"SubResource": {
"properties": {
Expand All @@ -1343,7 +1343,7 @@
"description": "Gets or sets the resource id."
}
},
"x-ms-external": true
"x-ms-azure-resource": true
},
"Object": {
"type": "object",
Expand Down
3 changes: 2 additions & 1 deletion arm-scheduler/2014-08-01-preview/swagger/scheduler.json
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,8 @@
"x-ms-enum": { "name": "RetryType", "modelAsString": "False" }
},
"retryInterval": {
"type": "integer",
"type": "string",
"format": "duration",
"description": "Gets or sets the retry interval between retries."
},
"retryCount": {
Expand Down

0 comments on commit 28ea011

Please sign in to comment.