Skip to content

octopus: ceph/admin: s/master/main#46219

Merged
zdover23 merged 1 commit intoceph:octopusfrom
zdover23:wip-doc-45512-backport-to-octopus
May 10, 2022
Merged

octopus: ceph/admin: s/master/main#46219
zdover23 merged 1 commit intoceph:octopusfrom
zdover23:wip-doc-45512-backport-to-octopus

Conversation

@zdover23
Copy link
Contributor

@zdover23 zdover23 commented May 10, 2022

This PR changes the name "master" to "main" so
that builds (and, I assume, a great many other
things) will not fail.

Signed-off-by: Zac Dover zac.dover@gmail.com
(cherry picked from commit 6a1dd3a)

Contribution Guidelines

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

This PR changes the name "master" to "main" so
that builds (and, I assume, a great many other
things) will not fail.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 6a1dd3a)
@zdover23 zdover23 requested review from ljflores and tchaikov May 10, 2022 15:19
@github-actions github-actions bot added this to the octopus milestone May 10, 2022
@zdover23 zdover23 requested review from jdurgin and neha-ojha May 10, 2022 15:19
@zdover23 zdover23 added the backport: no-conflicts Backport without conflicts label May 10, 2022
@ljflores ljflores changed the title ceph/admin: s/master/main octopus: ceph/admin: s/master/main May 10, 2022
@ljflores
Copy link
Member

@zdover23 if make check and the api tests are satisfied, this can be merged. I see that "readthedocs" is happy now, which was the main goal.

@zdover23
Copy link
Contributor Author

@zdover23 if make check and the api tests are satisfied, this can be merged. I see that "readthedocs" is happy now, which was the main goal.

@ljflores I'll keep checking until the API tests are satisfied (it's usually the singleton outlier that takes the longest). Thanks for altering the title for me. I'm new at the backport game, and I'm scrambling to learn its conventions. I appreciate the assist.

@zdover23
Copy link
Contributor Author

@zdover23 if make check and the api tests are satisfied, this can be merged. I see that "readthedocs" is happy now, which was the main goal.

@ljflores I'll keep checking until the API tests are satisfied (it's usually the singleton outlier that takes the longest). Thanks for altering the title for me. I'm new at the backport game, and I'm scrambling to learn its conventions. I appreciate the assist.

As foretold by (my own) prophecy (two minutes ago), the API tests are still [redacted profane phrase].

@zdover23
Copy link
Contributor Author

@zdover23 if make check and the api tests are satisfied, this can be merged. I see that "readthedocs" is happy now, which was the main goal.

@ljflores I'll keep checking until the API tests are satisfied (it's usually the singleton outlier that takes the longest). Thanks for altering the title for me. I'm new at the backport game, and I'm scrambling to learn its conventions. I appreciate the assist.

As foretold by (my own) prophecy (two minutes ago), the API tests are still [redacted profane phrase].

Started 1 hr 15 min ago
Build has been executing for 1 hr 15 min on 172.21.2.9+braggi09

Good God. The human lifespan is only threescore and ten. That's time for only 490,885 and a half builds if they take only 75 minutes, and you've got to figure that there are a few years when babies don't yet know how to trigger Jenkins to run the API tests, so the figure is inflated.

...and it finished.

@zdover23 zdover23 merged commit cffc58d into ceph:octopus May 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport: no-conflicts Backport without conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants