]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-11537' into next
authorJosh Durgin <jdurgin@redhat.com>
Thu, 18 Jun 2015 01:01:20 +0000 (18:01 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 18 Jun 2015 01:01:20 +0000 (18:01 -0700)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/librbd/WatchNotifyTypes.h

Simple merge