]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-inline'
authorSage Weil <sage@inktank.com>
Sun, 2 Feb 2014 17:15:27 +0000 (09:15 -0800)
committerSage Weil <sage@inktank.com>
Sun, 2 Feb 2014 17:16:06 +0000 (09:16 -0800)
Passed fs suite, sage-2014-02-01_22:18:10-fs-wip-inline-testing-basic-plana,
modulo a snap test error in the suite.

Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/common/config_opts.h

Simple merge