]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #315 from ceph/wip-10577
authorJosh Durgin <jdurgin@redhat.com>
Tue, 27 Jan 2015 00:09:33 +0000 (16:09 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 27 Jan 2015 00:09:33 +0000 (16:09 -0800)
Added "branch: dumpling" to fix #10577

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge