From: Loic Dachary <loic@dachary.org>
To: "Yan, Zheng" <ukernel@gmail.com>
Cc: Ceph Development <ceph-devel@vger.kernel.org>
Subject: merging pr 5311 was a noop
Date: Thu, 30 Jul 2015 22:15:27 +0200 [thread overview]
Message-ID: <55BA85DF.2010907@dachary.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 694 bytes --]
Hi Yan,
This actually is an interesting case :-) Yesterday you merged https://github.com/ceph/ceph/pull/5311 into hammer-12088. But you did it after hammer-12088 was merged into hammer ( https://github.com/ceph/ceph/pull/5222#issuecomment-125881146 ). Therefore the commit from pr 5311 never actually made it to hammer.
Fortunately it's easy to sort out: you just need to review https://github.com/ceph/ceph/pull/5427 which has the same commit as https://github.com/ceph/ceph/pull/5311 (I just took the liberty of editing the commit message to add <> around the mail name and a reference to the commit that introduced the leak).
Cheers
--
Loïc Dachary, Artisan Logiciel Libre
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
reply other threads:[~2015-07-30 20:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55BA85DF.2010907@dachary.org \
--to=loic@dachary.org \
--cc=ceph-devel@vger.kernel.org \
--cc=ukernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.