Merge remote-tracking branch 'gh/infernalis'

This commit is contained in:
Sage Weil 2015-09-06 14:19:39 -04:00
commit 52283b327c
3 changed files with 3 additions and 1 deletions

@ -1 +1 @@
Subproject commit dc409e0b2095eeb960518ab9c8ee47a34264f4c1
Subproject commit b0d1137d31e4b36b72ccae9c0a9a13de2ec82faa

View File

@ -88,6 +88,7 @@ int ErasureCodeCommand::setup(int argc, char** argv) {
CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
common_init_finish(g_ceph_context);
g_ceph_context->_conf->apply_changes(NULL);
g_conf->set_val("erasure_code_dir", ".libs", false, false);
if (vm.count("help")) {
cout << desc << std::endl;

View File

@ -87,6 +87,7 @@ int ErasureCodeBench::setup(int argc, char** argv) {
CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
common_init_finish(g_ceph_context);
g_ceph_context->_conf->apply_changes(NULL);
g_conf->set_val("erasure_code_dir", ".libs", false, false);
if (vm.count("help")) {
cout << desc << std::endl;