From: Sage Weil <sage@inktank.com>
Date: Mon, 24 Jun 2013 19:25:58 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.66~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cc36895e28819ac7076bb87b44ac0d341ba5add;p=ceph.git

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

8cc36895e28819ac7076bb87b44ac0d341ba5add
diff --cc src/mon/AuthMonitor.cc
index 5fa8644f3936,301133af2e5c..4dbdd3a11b4a
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@@ -109,9 -111,12 +110,12 @@@ 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();