Merge branch 'testing' into unstable

Conflicts:
	configure.ac

diff --cc configure.ac
Simple merge

diff --cc src/auth/Crypto.cc
Simple merge

diff --cc src/auth/ExportControl.cc
Simple merge

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

diff --cc src/mds/Locker.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/mon/MonClient.cc
Simple merge

diff --cc src/mon/PGMonitor.cc
Simple merge

diff --cc src/msg/SimpleMessenger.cc
Simple merge

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/os/ObjectStore.h
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PG.cc
index 67f80a75654ae62da83e6d815578283cfca31209,7175e13b7f175513fb5d94d918e3e816028d37a3..be604d4d33ad33ebdd0349c24bd1b0cde49df0f5
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -3295,23 -3319,16 +3315,23 @@@ void PG::scrub(
    }
    */
  
 -  ss << info.pgid << " " << mode << " ";
 -  if (errors)
 -    ss << errors << " errors";
 -  else
 -    ss << "ok";
 -  if (repair)
 -    ss << ", " << fixed << " fixed";
 -  osd->get_logclient()->log(errors ? LOG_ERROR:LOG_INFO, ss);
 +  {
 +    stringstream oss;
 +    oss << info.pgid << " " << mode << " ";
 +    if (errors)
 +      oss << errors << " errors";
 +    else
 +      oss << "ok";
 +    if (repair)
 +      oss << ", " << fixed << " fixed";
 +    oss << "\n";
 +    if (errors)
 +      osd->clog.error(oss);
 +    else
 +      osd->clog.info(oss);
 +  }
  
-   if (!(errors - fixed) && repair)
+   if (errors == 0 || (repair && (errors - fixed) == 0))
      state_clear(PG_STATE_INCONSISTENT);
    state_clear(PG_STATE_REPAIR);
  

diff --cc src/osd/PG.h
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge