]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9187 from liewegas/wip-cppool
authorYuri Weinstein <yuri.weinstein@gmail.com>
Sat, 28 May 2016 15:52:43 +0000 (08:52 -0700)
committerYuri Weinstein <yuri.weinstein@gmail.com>
Sat, 28 May 2016 15:52:43 +0000 (08:52 -0700)
rados: refuse to cppool if there are snaps; warn about user_version

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/include/rados/librados.hpp
src/librados/librados.cc
src/tools/rados/rados.cc

Simple merge
Simple merge
Simple merge