Merge branch 'next'

Conflicts:
	src/mon/AuthMonitor.cc

diff --cc debian/control
Simple merge

diff --cc src/mon/AuthMonitor.cc
index 001c3da92a410503c688fdc34e6a7f4a98f6667b,998ee0801b21abc10b93bc9cceeeffe4aab84e34..0761137784e0db8194f8eb42a67201c380ec3611
--- 1/src/mon/AuthMonitor.cc
--- 2/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();
    }