From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 6 Apr 2011 10:18:35 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.6~7^2
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=b870d31e2a380260faf8b85ff6b54d5fe775f882;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	src/eventl.c
---

b870d31e2a380260faf8b85ff6b54d5fe775f882
diff --cc src/client.c
index 9990dd0,9990dd0..89858d6
--- a/src/client.c
+++ b/src/client.c
@@@ -787,6 -787,6 +787,7 @@@ void client_lock(struct client *c
  void client_unlock(struct client *c)
  {
      yaz_mutex_leave(c->mutex);
++    sleep(1);
  }
  
  void client_incref(struct client *c)