Merge commit 'd00b917143e2afd72851bfd0400b2c2a1f3fc018' into auth

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

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

diff --cc src/config.cc
Simple merge

diff --cc src/cosd.cc
Simple merge

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

diff --cc src/mon/MonClient.cc
index ee00704825dee5c2bd88e6d189c735bfe6816867,eec0fc06c504b3787ee14b97fffd534fdef5a5a7..e7ec0d5768630fd402e4f3152c48ca34e3cae780
--- 1/src/mon/MonClient.cc
--- 2/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@@ -420,13 -355,10 +420,12 @@@ void MonClient::tick(
  {
    dout(10) << "tick" << dendl;
  
 +  _check_auth_rotating();
 +  
    if (hunting) {
-     dout(0) << "continuing hunt" << dendl;
+     dout(1) << "continuing hunt" << dendl;
      _reopen_session();
- 
-   } else {
+   } else if (cur_mon >= 0) {
      // just renew as needed
      utime_t now = g_clock.now();
      if (now > sub_renew_after)

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

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

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

diff --cc src/osd/OSD.h
index fbb66b083ff2960b23c315c935be3910fd482b2f,5d662cb1fdc4c87b1ce494e9b2be79b60aee4aed..9b1ab2041f39df36db7afc322b1f9b5e57ff0070
--- 1/src/osd/OSD.h
--- 2/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@@ -106,9 -101,9 +106,10 @@@ protected
  
    LogClient   logclient;
  
 +
    int whoami;
    const char *dev_path, *journal_path;
+   bool mknewjournal;
  
    class C_Tick : public Context {
      OSD *osd;

diff --cc src/rados.cc
Simple merge