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

osd: renamed the new vector name in OSDMap::build_simple_crush_map_from_conf #14583

Merged
merged 2 commits into from Apr 21, 2017

Conversation

Projects
None yet
3 participants
@joscollin
Member

joscollin commented Apr 17, 2017

Renamed the new vector name in OSDMap::build_simple_crush_map_from_conf, to avoid confusing
it with the sections vector outside the for loop and which is iterating.

Signed-off-by: Jos Collin jcollin@redhat.com

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 17, 2017

can you rebase to get rid of the merge commits please?

@joscollin

This comment has been minimized.

Member

joscollin commented Apr 18, 2017

@liewegas Done.

@yuriw

This comment has been minimized.

Contributor

yuriw commented Apr 18, 2017

@joscollin @liewegas pls resolve conflicts

[yuriw@smithi148 build]$ git pull https://github.com/joscollin/ceph.git wip-cleanup-osdmap-sections
remote: Counting objects: 5, done.
remote: Total 5 (delta 4), reused 4 (delta 4), pack-reused 1
Unpacking objects: 100% (5/5), done.
From https://github.com/joscollin/ceph

  • branch wip-cleanup-osdmap-sections -> FETCH_HEAD
    Auto-merging src/osd/OSDMap.cc
    CONFLICT (content): Merge conflict in src/osd/OSDMap.cc
    Automatic merge failed; fix conflicts and then commit the result.
osd: renamed the new vector name in OSDMap::build_simple_crush_map_fr…
…om_conf

Renamed the new vector name in OSDMap::build_simple_crush_map_from_conf, to avoid confusing it with the sections vector outside the for loop and which is iterating.

Signed-off-by: Jos Collin <jcollin@redhat.com>

@joscollin joscollin changed the title from osd: renamed the new vector name in OSDMap::build_simple_crush_map_from_conf to DNM: osd: renamed the new vector name in OSDMap::build_simple_crush_map_from_conf Apr 19, 2017

osd: renamed the new vector name in OSDMap::build_simple_crush_map_fr…
…om_conf

Renamed the new vector name in OSDMap::build_simple_crush_map_from_conf, to avoid confusing it
with the sections vector outside the for loop and which is iterating.

Resolved merge conflicts.

Signed-off-by: Jos Collin <jcollin@redhat.com>

@joscollin joscollin changed the title from DNM: osd: renamed the new vector name in OSDMap::build_simple_crush_map_from_conf to osd: renamed the new vector name in OSDMap::build_simple_crush_map_from_conf Apr 19, 2017

@joscollin

This comment has been minimized.

Member

joscollin commented Apr 19, 2017

@liewegas @yuriw : Resolved the merge conflicts. Please review and merge now.

@liewegas liewegas merged commit dee8f39 into ceph:master Apr 21, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@joscollin joscollin deleted the joscollin:wip-cleanup-osdmap-sections branch Apr 22, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment