]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-max_size-3637' into next
authorGreg Farnum <greg@inktank.com>
Thu, 18 Apr 2013 17:39:03 +0000 (10:39 -0700)
committerGreg Farnum <greg@inktank.com>
Thu, 18 Apr 2013 17:39:03 +0000 (10:39 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/common/config_opts.h
src/mds/Locker.cc

Simple merge
Simple merge