Merge branch 'testing' into unstable

diff --cc src/client/Client.cc
Simple merge

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

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

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

diff --cc src/mon/OSDMonitor.h
index 1e98b2ed43d3c7e371b3461ead5e3cf587a73dad,0de8862906fb8a3e01366a96307e7196e6860432..9be1ab30750cae5b00b95caa67837baafab00293
--- 1/src/mon/OSDMonitor.h
--- 2/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@@ -67,12 -66,10 +67,12 @@@ private
    // ...
    void send_to_waiting();     // send current map to waiters.
    void send_full(PaxosServiceMessage *m);
-   MOSDMap *build_incremental(epoch_t from, epoch_t to);
-   void send_incremental(PaxosServiceMessage *m, epoch_t since);
-   void send_incremental(epoch_t from, entity_inst_t& dest);
+   MOSDMap *build_incremental(epoch_t first, epoch_t last);
+   void send_incremental(PaxosServiceMessage *m, epoch_t first);
+   void send_incremental(epoch_t first, entity_inst_t& dest);
  
 +  void remove_redundant_pg_temp();
 +
   
    bool preprocess_failure(class MOSDFailure *m);
    bool prepare_failure(class MOSDFailure *m);

diff --cc src/osdc/Objecter.cc
Simple merge