Merge branch 'wip-conf-root' of https://github.com/liewegas/ceph

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

diff --cc src/common/admin_socket.cc
Simple merge

diff --cc src/common/admin_socket.h
Simple merge

diff --cc src/common/ceph_context.cc
Simple merge

diff --cc src/common/common_init.h
Simple merge

diff --cc src/common/config.cc
index 562582b11e8d509af59c914841619c690ce552b2,d0789366393228323d7ba2b927dc90c9e686434f..622e23715c4a42ee5bac8e93bea841589214ee0a
--- 1/src/common/config.cc
--- 2/src/common/config.cc
+++ b/src/common/config.cc
@@@ -216,26 -216,9 +215,27 @@@ int md_config_t::parse_config_files(con
        conf_files = CEPH_CONF_FILE_DEFAULT;
      }
    }
 +
    std::list<std::string> cfl;
    get_str_list(conf_files, cfl);
-   return parse_config_files_impl(cfl, parse_errors, warnings);
++
 +  auto p = cfl.begin();
 +  while (p != cfl.end()) {
 +    // expand $data_dir?
 +    string &s = *p;
 +    if (s.find("$data_dir") != string::npos) {
 +      if (data_dir_option.length()) {
 +      list<config_option*> stack;
 +      expand_meta(s, NULL, stack, warnings);
 +      p++;
 +      } else {
 +      cfl.erase(p++);  // ignore this item
 +      }
 +    } else {
 +      ++p;
 +    }
 +  }
+   return parse_config_files_impl(cfl, warnings);
  }
  
  int md_config_t::parse_config_files_impl(const std::list<std::string> &conf_files,

diff --cc src/common/config.h
Simple merge

diff --cc src/global/global_init.cc
Simple merge

diff --cc src/libcephfs.cc
Simple merge

diff --cc src/librados/librados.cc
Simple merge

diff --cc src/log/Log.cc
Simple merge

diff --cc src/log/Log.h
Simple merge

diff --cc src/test/librados_test_stub/LibradosTestStub.cc
Simple merge