You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by us...@apache.org on 2013/12/03 23:58:34 UTC

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

Author: uschindler
Date: Tue Dec  3 22:58:34 2013
New Revision: 1547632

URL: http://svn.apache.org/r1547632
Log:
Merged revision(s) 1547631 from lucene/dev/trunk:
Fix annotation

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/ClusterState.java

Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1547632&r1=1547631&r2=1547632&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Tue Dec  3 22:58:34 2013
@@ -160,8 +160,8 @@ public class ClusterState implements JSO
 
   /**
    * @return Map&lt;collectionName, Map&lt;sliceName,Slice&gt;&gt;
-   * @deprecated
    */
+  @Deprecated
   public Map<String, DocCollection> getCollectionStates() {
     return Collections.unmodifiableMap(collectionStates);
   }