Explorar o código

ZOOKEEPER-347. zkfuse uses non-standard String. (patrick hunt via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@763435 13f79535-47bb-0310-9956-ffa450edef68
Mahadev Konar %!s(int64=16) %!d(string=hai) anos
pai
achega
945c181540
Modificáronse 2 ficheiros con 3 adicións e 1 borrados
  1. 2 0
      CHANGES.txt
  2. 1 1
      src/contrib/zkfuse/src/zkfuse.cc

+ 2 - 0
CHANGES.txt

@@ -43,6 +43,8 @@ BUGFIXES:
 
 
   ZOOKEEPER-370. Fix critical problems reported by findbugs. (flavio via mahadev)
   ZOOKEEPER-370. Fix critical problems reported by findbugs. (flavio via mahadev)
 
 
+  ZOOKEEPER-347. zkfuse uses non-standard String. (patrick hunt via mahadev)
+
 IMPROVEMENTS:
 IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
   (breed via mahadev)
   (breed via mahadev)

+ 1 - 1
src/contrib/zkfuse/src/zkfuse.cc

@@ -4279,7 +4279,7 @@ main(int argc, char *argv[])
     /**
     /**
      * Initialize log4cxx 
      * Initialize log4cxx 
      */
      */
-    const String file("log4cxx.properties");
+    const std::string file("log4cxx.properties");
     PropertyConfigurator::configureAndWatch( file, 5000 );
     PropertyConfigurator::configureAndWatch( file, 5000 );
     LOG_INFO(LOG, "Starting zkfuse");
     LOG_INFO(LOG, "Starting zkfuse");