Merge pull request #15251 from joscollin/wip-cleanup-redundant-headers-4

common: Remove redundant includes - 4

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

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

diff --cc src/common/config_validators.cc
index 2b095cab05a0871e7987afb40a8c4d698cd52d77,5a3392919aee48ac75463bebef7f04c62cfe86d6..ebd3eb37a5f0961df69e0c3337a407edb1d89533
--- 1/src/common/config_validators.cc
--- 2/src/common/config_validators.cc
+++ b/src/common/config_validators.cc
@@@ -3,33 -3,9 +3,30 @@@
  
  #include "common/config_validators.h"
  #include "include/stringify.h"
- #include "include/rbd/features.h"
- #include <map>
- #include <sstream>
- #include <vector>
+ 
  #include <boost/algorithm/string.hpp>
  #include <boost/lexical_cast.hpp>
 +#include <boost/regex.hpp>
 +
 +int validate(md_config_t::option_rbd_default_pool_t *,
 +             std::string *value, std::string *error_message) {
 +  boost::regex pattern("^[^@/]+$");
 +  if (!boost::regex_match (*value, pattern)) {
 +    *value = "rbd";
 +    *error_message = "invalid RBD default pool, resetting to 'rbd'";
 +  }
 +  return 0;
 +}
 +
 +int validate(md_config_t::option_rbd_default_data_pool_t *,
 +             std::string *value, std::string *error_message) {
 +  boost::regex pattern("^[^@/]*$");
 +  if (!boost::regex_match (*value, pattern)) {
 +    *value = "";
 +    *error_message = "ignoring invalid RBD data pool";
 +  }
 +  return 0;
 +}
  
  int validate(md_config_t::option_rbd_default_features_t *,
               std::string *value, std::string *error_message) {

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