Skip to content

Commit

Permalink
Merge branch 'master' into tool-unserve-api
Browse files Browse the repository at this point in the history
Signed-off-by: Dean Roehrich <[email protected]>
  • Loading branch information
roehrich-hpe committed Nov 15, 2024
2 parents 1b516ba + 7617602 commit 69f959f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/crd-bumper/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The following example will vendor the new `v1beta2` API we created above for lus

```console
[email protected]:NearNodeFlash/nnf-sos.git
vendor-new-api.py -r $DEST_REPO --hub-ver v1alpha3 --vendor-hub-ver v1beta2 --module github.com/NearNodeFlash/lustre-fs-operator --version master
vendor-new-api.py -r $DEST_REPO --hub-ver v1alpha3 --vendor-hub-ver v1beta2 --module github.com/NearNodeFlash/lustre-fs-operator --version master
```

The repository with its new API will be found under a directory named `workingspace/nnf-sos`.
Expand Down
2 changes: 1 addition & 1 deletion tools/crd-bumper/vendor-new-api.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def main():

if args.branch is None:
bn = os.path.basename(args.module)
args.branch = f"api-{bn}-{args.hub_ver}"
args.branch = f"api-{bn}-{args.vendor_hub_ver}"
if args.this_branch:
print("Continuing work in current branch")
else:
Expand Down

0 comments on commit 69f959f

Please sign in to comment.