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

mimic: mgr: drop GIL in get_config #26612

Merged
merged 1 commit into from Mar 19, 2019

Conversation

Projects
None yet
3 participants
@badone
Copy link
Contributor

commented Feb 24, 2019

@badone badone added this to the mimic milestone Feb 24, 2019

@badone badone changed the title mgr: drop GIL in get_config mimic: mgr: drop GIL in get_config Feb 24, 2019

@smithfarm
Copy link
Contributor

left a comment

In the commit message, please move the conflicts section to after the cherry-picked from line, like so:

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit d590a53)

Conflicts:
        src/mgr/ActivePyModules.cc

(See git checkout mimic ; git log --grep Conflicts for examples)

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Feb 28, 2019

General rule of thumb: when editing the commit message of a cherry-pick, never modify the part starting from the "cherry-picked from" line to the beginning, inclusive.

mgr: drop GIL in get_config
Fixes: https://tracker.ceph.com/issues/35985

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit d590a53)

Conflicts:
        src/mgr/ActivePyModules.cc

@badone badone force-pushed the badone:wip-mimic-drop-GIL-in-get_config branch from ae16b83 to 81b85b3 Feb 28, 2019

@badone

This comment has been minimized.

Copy link
Contributor Author

commented Mar 13, 2019

OK now @smithfarm ?

@smithfarm
Copy link
Contributor

left a comment

Not just OK - impeccable.

@yuriw

This comment has been minimized.

Copy link
Contributor

commented Mar 14, 2019

@yuriw yuriw merged commit ea8bf90 into ceph:mimic Mar 19, 2019

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.