From: Sage Weil <sage@inktank.com>
Date: Fri, 15 Mar 2013 04:11:35 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.60~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=632f7200bb15585ad71ac0d49d31b65510231494;p=ceph.git

Merge branch 'next'

Conflicts:
	src/mon/AuthMonitor.cc
---

632f7200bb15585ad71ac0d49d31b65510231494
diff --cc src/mon/AuthMonitor.cc
index 001c3da92a41,998ee0801b21..0761137784e0
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@@ -343,7 -343,7 +343,8 @@@ uint64_t AuthMonitor::assign_global_id(
    bool return_next = (next_global_id <= max_global_id);
  
    // bump the max?
-   while (next_global_id >= max_global_id - g_conf->mon_globalid_prealloc / 2) {
 -  while (mon->is_leader() && next_global_id >= max_global_id) {
++  while (mon->is_leader() &&
++	 next_global_id >= max_global_id - g_conf->mon_globalid_prealloc / 2) {
      increase_max_global_id();
    }