From: Dennis Schafroth <dennis@schafroth.com>
Date: Fri, 29 Nov 2013 11:36:36 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
X-Git-Tag: v0.6.0~6^2~11
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=f5b18940fb5c27e0a137a8838b8d327dda051f0f;hp=53c274810a73ee1a571b4586c18ac938fb53a19e;p=lui-solr.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
---

diff --git a/zookeeper/zookeeper.sh.pid b/zookeeper/zookeeper.sh.pid
deleted file mode 100644
index 3ebb04f..0000000
--- a/zookeeper/zookeeper.sh.pid
+++ /dev/null
@@ -1 +0,0 @@
-18024