From: Josh Durgin Date: Tue, 24 Apr 2012 20:58:56 +0000 (-0700) Subject: Merge remote branch 'origin/wip-rbd-snapid' into next X-Git-Tag: v0.46~14 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34ef3f37655a42c376cd1e9e490e4cccf2f44855;p=ceph.git Merge remote branch 'origin/wip-rbd-snapid' into next Reviewed-by: Sage Weil --- 34ef3f37655a42c376cd1e9e490e4cccf2f44855