]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-2862'
authorJosh Durgin <jdurgin@redhat.com>
Wed, 8 Apr 2015 20:51:31 +0000 (13:51 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 8 Apr 2015 20:55:13 +0000 (13:55 -0700)
commit94ceeb94bab4d942c50ab3f70c1df389acd31ded
tree2947d73403e1e5417e17da803bbb75a73673add9
parent28820a55b8cda49b25922d64f4cdc2da096f4bed
parentfb51175acdf799799287d791888749c9ed2f4240
Merge remote-tracking branch 'origin/wip-2862'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/common/ceph_argparse.cc
src/rbd.cc
src/common/ceph_argparse.cc
src/rbd.cc