Skip to content

Repair conflict markers merged into rpk-overrides.json #1874

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

Closed
JakeSCahill wants to merge 1 commit into from
+12 −27
Closed

Repair conflict markers merged into rpk-overrides.json #1874

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 12 additions & 27 deletions docs-data/rpk-overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3258,7 +3258,7 @@
"description": "Stop a managed agent, setting its desired state to stopped."
},
"rpk ai llm-provider check": {
"description": "Run a lightweight probe against the configured LLM provider to verify credentials and reachability."
"introducedInVersion": "0.2.32"
},
"rpk ai agent credential create": {
"description": "Create a client ID and secret pair for an agent. The client secret is shown once and cannot be retrieved again."
Expand Down Expand Up @@ -3485,11 +3485,8 @@
},
"rpk cluster brokers": {
"pageAliases": "reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers.adoc",
<<<<<<< HEAD
"introducedInVersion": "v26.2.1"
=======
"introducedInVersion": "v26.2.1",
"selfHostedOnly": true
>>>>>>> a8cf35b4 (Add selfHostedOnly overrides for cloud-unavailable rpk commands)
},
"rpk cluster brokers decommission": {
"pageAliases": "reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc",
Expand All @@ -3505,11 +3502,8 @@
},
"rpk cluster loggers": {
"pageAliases": "reference:rpk/rpk-redpanda/rpk-redpanda-admin-config-log-level.adoc",
<<<<<<< HEAD
"introducedInVersion": "v26.2.1"
=======
"introducedInVersion": "v26.2.1",
"selfHostedOnly": true
>>>>>>> a8cf35b4 (Add selfHostedOnly overrides for cloud-unavailable rpk commands)
},
"rpk cluster loggers set": {
"pageAliases": "reference:rpk/rpk-redpanda/rpk-redpanda-admin-config-log-level-set.adoc",
Expand Down Expand Up @@ -3570,7 +3564,6 @@
},
"rpk check install": {
"description": "Install Redpanda Check.\n\nThis command installs the latest version by default.\n\nAlternatively, you may specify a version using the `--check-version` flag.\n\nYou may force the installation using the `--force` flag.",
<<<<<<< HEAD
"_note": "The source help text is missing a period after the summary sentence, which breaks the generated meta description.",
"introducedInVersion": "v26.2.1"
},
Expand All @@ -3580,9 +3573,6 @@
"rpk ai llm-provider apply": {
"introducedInVersion": "0.2.32"
},
"rpk ai llm-provider check": {
"introducedInVersion": "0.2.32"
},
"rpk ai llm-provider create": {
"introducedInVersion": "0.2.32"
},
Expand Down Expand Up @@ -3677,7 +3667,8 @@
"introducedInVersion": "v26.2.1"
},
"rpk cluster upgrade": {
"introducedInVersion": "v26.2.1"
"introducedInVersion": "v26.2.1",
"selfHostedOnly": true
},
"rpk cluster upgrade finalize": {
"introducedInVersion": "v26.2.1"
Expand Down Expand Up @@ -3750,33 +3741,27 @@
"introducedInVersion": "v26.2.1"
}
}
=======
"_note": "The source help text is missing a period after the summary sentence, which breaks the generated meta description."
},
"rpk cluster license": {
"selfHostedOnly": true
},
"rpk cluster upgrade": {
"selfHostedOnly": true
},
"rpk cluster config edit": {
"selfHostedOnly": true
},
"rpk cluster config export": {
"selfHostedOnly": true
},
"rpk transform pause": {
"rpk cluster license": {
"selfHostedOnly": true
},
"rpk transform resume": {
"rpk profile validate": {
"selfHostedOnly": true
},
"rpk shadow config": {
"selfHostedOnly": true
},
"rpk profile validate": {
"rpk transform pause": {
"selfHostedOnly": true
},
"rpk transform resume": {
"selfHostedOnly": true
>>>>>>> a8cf35b4 (Add selfHostedOnly overrides for cloud-unavailable rpk commands)
}
}
}
}
Loading