pacific: mgr/rook: Add timezone info #39834
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@sebastian-philipp Is your "mass backport to pacific" script setting the milestone wrong? |
varshar16
approved these changes
Mar 8, 2021
|
This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved |
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit ea51f69)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit a0930a6)
This is due to `mgr/rook` now also includes `._helper` Co-authored-by Kefu Chai <kchai@redhat.com> Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit a3555a2)
Recently time zone info was added[1] to various properties like created, started and others in cephadm and changes were made to orchestrator module too. Let's add timezone info to rook as well, which will fix the type error. [1] ceph#37920 Fixes: https://tracker.ceph.com/issues/49126 Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit d7fac54)
sebastian-philipp
force-pushed
the
pacific-backport-39131-39373
branch
from
fc96dad
to
ed7436b
Compare
|
rebased |
jmolmo
approved these changes
Jun 17, 2021
votdev
pushed a commit
to votdev/ceph
that referenced
this pull request
Aug 2, 2021
…-39131-39373 pacific: mgr/rook: Add timezone info Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com> Reviewed-by: Varsha Rao <varao@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #39131, #39373