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

osd: FileJournal: fix journalq population in do_read_entry() #3960

Merged
1 commit merged into from Mar 16, 2015
Merged

osd: FileJournal: fix journalq population in do_read_entry() #3960

1 commit merged into from Mar 16, 2015

Conversation

ghost
Copy link

@ghost ghost commented Mar 11, 2015

http://tracker.ceph.com/issues/6003

Fixes: 6003
Backport: dumpling, firefly, giant
Signed-off-by: Samuel Just sjust@redhat.com
(cherry picked from commit bae1f3e)

Conflicts:
src/os/FileJournal.cc
because reinterpret_cast was added near two hunks after firefly

@ghost ghost added bug-fix core labels Mar 11, 2015
@ghost ghost added this to the firefly milestone Mar 11, 2015
@ghost ghost self-assigned this Mar 11, 2015
@loic-bot
Copy link

FAIL: the output of run-make-check.sh on centos-7 for cc8c995 is http://paste2.org/1ByGv2p1

:octocat: Sent from GH.

Fixes: 6003
Backport: dumpling, firefly, giant
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit bae1f3e)

Conflicts:
	src/os/FileJournal.cc
        because reinterpret_cast was added near two hunks after firefly
@loic-bot
Copy link

SUCCESS: the output of run-make-check.sh on centos-7 for 79b2c7e is http://paste2.org/zFwH8X0j

:octocat: Sent from GH.

@athanatos
Copy link
Contributor

lgtm

ghost pushed a commit that referenced this pull request Mar 16, 2015
FileJournal: fix journalq population in do_read_entry()

Reviewed-by: Samuel Just <sjust@redhat.com>
@ghost ghost merged commit cd675bb into ceph:firefly Mar 16, 2015
@ghost ghost changed the title FileJournal: fix journalq population in do_read_entry() osd: FileJournal: fix journalq population in do_read_entry() Jul 14, 2015
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants