Merge remote-tracking branch 'gh/next'

diff --cc src/init-radosgw.sysv
Simple merge

diff --cc src/mon/AuthMonitor.cc
index 4dbdd3a11b4a7d2a6f31caaf373b837dbde8b854,24542564e8ef8aa9945cd3cc0b293a5d1c9113f3..9901dab7def0113ab0987f198367e1ce01b8c3ce
--- 1/src/mon/AuthMonitor.cc
--- 2/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();

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