Skip to content

Commit 04d108e

Browse files
authored
fix nexus-lockstep semantic merge conflict, #9037 vs #9063 (#9077)
1 parent 47aa2a9 commit 04d108e

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

openapi/nexus-lockstep.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7087,6 +7087,21 @@
70877087
"type"
70887088
]
70897089
},
7090+
{
7091+
"description": "Waiting on zones to propagate to inventory.",
7092+
"type": "object",
7093+
"properties": {
7094+
"type": {
7095+
"type": "string",
7096+
"enum": [
7097+
"inventory_propagation"
7098+
]
7099+
}
7100+
},
7101+
"required": [
7102+
"type"
7103+
]
7104+
},
70907105
{
70917106
"description": "Waiting on updates to RoT / SP / Host OS / etc.",
70927107
"type": "object",

0 commit comments

Comments
 (0)