You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/07/02 22:32:17 UTC

svn commit: r1356472 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/solrj/ solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java

Author: rmuir
Date: Mon Jul  2 20:32:16 2012
New Revision: 1356472

URL: http://svn.apache.org/viewvc?rev=1356472&view=rev
Log:
merge r1356469

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java

Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java?rev=1356472&r1=1356471&r2=1356472&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java Mon Jul  2 20:32:16 2012
@@ -55,7 +55,6 @@ public class ZkCmdExecutor {
    * Perform the given operation, retrying if the connection fails
    * 
    * @param operation
-   * @return
    * @throws KeeperException
    * @throws InterruptedException
    */