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.

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

Backport changes from cockroachdb/docs#19001 #19103

Merged
merged 2 commits into from
Nov 13, 2024

Conversation

rmloveland
Copy link
Contributor

Addresses DOC-10665, DOC-11674

Summary of changes:

Addresses DOC-10665, DOC-11674

Summary of changes:

- Backport changes from #19001; a few manual edits were
  required due to a few patches that didn't merge automagically
@rmloveland rmloveland requested a review from taroface November 6, 2024 21:52
Copy link

github-actions bot commented Nov 6, 2024

Files changed:

Copy link

netlify bot commented Nov 6, 2024

Netlify Preview

Name Link
🔨 Latest commit 78fdf46
🔍 Latest deploy log https://app.netlify.com/sites/cockroachdb-docs/deploys/6734cbe68d683200085fc562
😎 Deploy Preview https://deploy-preview-19103--cockroachdb-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@rmloveland
Copy link
Contributor Author

@taroface this was done using your instructions at https://cockroachlabs.atlassian.net/wiki/x/eQDr3

a few manual edits were required in older versions where .rej files were generated but it's very faithful in spirit to the original PR IMO

@rmloveland rmloveland requested review from kathancox and removed request for taroface November 13, 2024 15:55
Copy link
Contributor

@kathancox kathancox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @rmloveland, I scanned quickly through all the diffs for any obvious issues, but looks good.

@rmloveland rmloveland merged commit e6f2688 into 20241029-DOC-10624-backports Nov 13, 2024
4 checks passed
@rmloveland rmloveland deleted the 20241106-backport-19001 branch November 13, 2024 16:39
rmloveland added a commit that referenced this pull request Nov 18, 2024
* Backport changes from #19008 (#19106)

Addresses DOC-11674

Summary of changes:

- Backport changes from #19008 to v23.1, v23.2, v24.1,
  and v24.2

* Backport changes from #19072 (#19109)

* Backport changes from #19072

Addresses DOC-11674

Summary of changes:

- Backport #19072 to v23.1, v23.2, v24.1, v24.2

* Backport changes from #19031 (#19108)

Addresses DOC-11674

Summary of changes:

- Backport #19031 to v23.1, v23.2, v24.1, v24.2

* Backport changes from #19001 (#19103)

Addresses DOC-10665, DOC-11674

Summary of changes:

- Backport changes from #19001; a few manual edits were
  required due to a few patches that didn't merge automagically

* Backport changes from #19126 (#19133)

Addresses DOC-11674, DOC-11692

* Merge origin/main into 20241029-DOC-10624-backports (#19140)

* Merge origin/main back into core relicensing backport branch (#19142)

* Backport changes from #19002 (#19138)

* Backport changes from #19002

Addresses DOC-11674

* Backport telemetry docs from #19131 (#19145)

Addresses DOC-11051

* Backport upgrade license info from #19125 (#19146)

Addresses DOC-11693

* Fix broken link on upgrade page include

---------

Co-authored-by: Rich Loveland <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants