From: Sage Weil <sage@inktank.com>
Date: Tue, 25 Jun 2013 03:41:15 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.66~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37a20174fd22a79938ba9c93046e8830f4a3306f;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

37a20174fd22a79938ba9c93046e8830f4a3306f
diff --cc src/mon/AuthMonitor.cc
index 4dbdd3a11b4a,24542564e8ef..9901dab7def0
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@@ -110,12 -116,9 +115,9 @@@ void AuthMonitor::create_initial(
    inc.inc_type = GLOBAL_ID;
    inc.max_global_id = max_global_id;
    pending_auth.push_back(inc);
- 
-   // initalize rotating keys, too
-   check_rotate();
  }
  
 -void AuthMonitor::update_from_paxos()
 +void AuthMonitor::update_from_paxos(bool *need_bootstrap)
  {
    dout(10) << __func__ << dendl;
    version_t version = get_version();