]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rbd-listwatchers'
authorJosh Durgin <jdurgin@redhat.com>
Mon, 2 Feb 2015 09:33:32 +0000 (10:33 +0100)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 2 Feb 2015 09:33:32 +0000 (10:33 +0100)
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge