You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2015/01/27 00:43:53 UTC

svn commit: r1654914 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt solr/build.xml

Author: sarowe
Date: Mon Jan 26 23:43:52 2015
New Revision: 1654914

URL: http://svn.apache.org/r1654914
Log:
SOLR-5918: ant clean does not remove ZooKeeper data (merged trunk r1654913)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/build.xml   (contents, props changed)

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1654914&r1=1654913&r2=1654914&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Jan 26 23:43:52 2015
@@ -772,6 +772,8 @@ Other Changes
 * SOLR-7018: bin/solr stop should stop if there is only one node running or generate
   an error message prompting the user to be explicit about which of multiple nodes
   to stop using the -p or -all options (Timothy Potter)
+  
+* SOLR-5918: ant clean does not remove ZooKeeper data (Varun Thacker, Steve Rowe)
 
 * SOLR-7020: 'bin/solr start' should automatically use an SSL-enabled alternate jetty
   configuration file when in SSL mode, eliminating the need for manual jetty.xml edits.

Modified: lucene/dev/branches/branch_5x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/build.xml?rev=1654914&r1=1654913&r2=1654914&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/build.xml Mon Jan 26 23:43:52 2015
@@ -311,7 +311,7 @@
       </fileset>
       <fileset dir="server">
         <include name="**/data/**/*" />
-        <include name="solr/zoo_data" />
+        <include name="solr/zoo_data/" />
         <include name="start.jar" />
         <include name="logs/*" />
         <include name="webapps/**/*" />