Merge remote-tracking branch 'gh/next'

diff --cc src/mon/AuthMonitor.cc
index 5fa8644f3936865c1f0ac84f219e012663d88654,301133af2e5c476769c2b710ab071a13a7aa82c5..4dbdd3a11b4a7d2a6f31caaf373b837dbde8b854
--- 1/src/mon/AuthMonitor.cc
--- 2/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();

diff --cc src/mon/AuthMonitor.h
Simple merge

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

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