From: Dennis Schafroth Date: Thu, 2 Jan 2014 10:47:01 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr X-Git-Tag: v0.6.2~3^2~1 X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=commitdiff_plain;h=667239393bb19f5cf9679eb9957b8a94a52af68d;hp=57553096802b7c6f51dbe68b8957e70d8a7b8bc1 Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr --- diff --git a/debian/rules b/debian/rules index 865a0fe..3c981b6 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,7 @@ LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE) LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat6 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT) CATALINA_HOME=/usr/share/tomcat6 -SOLR_VERSION=4.4.0 +SOLR_VERSION=4.6.0 LUI_SOLR_ZK = $(BASE)-zookeeper LUI_SOLR_ZK_ROOT = $(CURDIR)/debian/$(LUI_SOLR_ZK)