osd: pull latest dmclock subtree #19345
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
6f9250b4e9 Merge pull request ceph#45 from TaewoongKim/reduce_phasetype_size 343e4105a6 Reduce the size of enum class PhaseType git-subtree-dir: src/dmclock git-subtree-split: 6f9250b4e97860373b782e918044de40ed197c87
…g-in-dmclock Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
|
@ivancich please note, @adamemerson 's change has been pulled in in #18711. |
tchaikov
approved these changes
Dec 6, 2017
|
@tchaikov Yes, I noticed that had been merged directly from ceph rather than indirectly through dmclock. But I think this subtree pull will sync those files between the two repos, but perhaps I didn't word it well in the PR message. |
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.
This includes @TaewoongKim 's reduction of phasetype size and synchronizes the changes surrounding @adamemerson 's mark dependency includes as SYSTEM in dmclock.