Finish rebase

diff --git a/pdns/histogram.hh b/pdns/histogram.hh
index f3c34fe57cbf530ebe0d42eaa25968d9a2792caf..0e04944f1241363a8bdb39eedcc2a275c8330064 100644 (file)
--- a/pdns/histogram.hh
+++ b/pdns/histogram.hh
@@ -57,8 +57,8 @@ template <class B>
 class BaseHistogram
 {
 public:
-
-  BaseHistogram(const std::string& prefix, const std::vector<uint64_t>& boundaries) : d_name(prefix)
+  BaseHistogram(const std::string& prefix, const std::vector<uint64_t>& boundaries) :
+    d_name(prefix)
   {
     if (!std::is_sorted(boundaries.cbegin(), boundaries.cend())) {
       throw std::invalid_argument("boundary array must be sorted");
@@ -144,7 +144,6 @@ private:
   std::vector<B> d_buckets;
   std::string d_name;
 
-
   std::vector<uint64_t> to125(uint64_t start, int num)
   {
     std::vector<uint64_t> boundaries;

diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 35a3dcc786d37b74590cab01f54e541ab01b6312..fb3f3bd7c8cd82a8368945f98c220d7751d2cf77 100644 (file)
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -211,7 +211,7 @@ StatsMap getAllStatsMap(StatComponent component)
   }
 
   for(const auto& themultimember : d_getmultimembers) {
-    if (blacklistMap.count(themultimember.first) == 0) {
+    if (disabledlistMap.count(themultimember.first) == 0) {
       ret.merge(themultimember.second());
     }
   }