Return-Path: 
 <solr-commits-return-6379-apmail-lucene-solr-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-solr-commits-archive@minotaur.apache.org
Received: (qmail 94255 invoked from network); 1 Feb 2010 20:35:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 1 Feb 2010 20:35:31 -0000
Received: (qmail 82301 invoked by uid 500); 1 Feb 2010 20:35:31 -0000
Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org
Received: (qmail 82248 invoked by uid 500); 1 Feb 2010 20:35:31 -0000
Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:solr-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:solr-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:solr-commits@lucene.apache.org>
List-Id: <solr-commits.lucene.apache.org>
Reply-To: solr-dev@lucene.apache.org
Delivered-To: mailing list solr-commits@lucene.apache.org
Received: (qmail 82239 invoked by uid 99); 1 Feb 2010 20:35:31 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2010 20:35:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2010 20:35:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7F6DD23888D1; Mon,  1 Feb 2010 20:35:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r905404 - in /lucene/solr/branches/cloud:
 example/solr/solr.xml
 src/webapp/web/admin/index.jsp
Date: Mon, 01 Feb 2010 20:35:08 -0000
To: solr-commits@lucene.apache.org
From: yonik@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100201203508.7F6DD23888D1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: yonik
Date: Mon Feb  1 20:35:07 2010
New Revision: 905404

URL: http://svn.apache.org/viewvc?rev=905404&view=rev
Log:
add zk link to admin, add shardId to solr.xml

Modified:
    lucene/solr/branches/cloud/example/solr/solr.xml
    lucene/solr/branches/cloud/src/webapp/web/admin/index.jsp

Modified: lucene/solr/branches/cloud/example/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/example/solr/solr.xml?rev=905404&r1=905403&r2=905404&view=diff
==============================================================================
--- lucene/solr/branches/cloud/example/solr/solr.xml (original)
+++ lucene/solr/branches/cloud/example/solr/solr.xml Mon Feb  1 20:35:07 2010
@@ -29,6 +29,14 @@
     If 'null' (or absent), cores will not be manageable via request handler
   -->
   <cores adminPath="/admin/cores" defaultCoreName="collection1">
-    <core name="collection1" instanceDir="." />
+    <core name="collection1" instanceDir="." shardId="shard1"/>
+    <!-- 
+      SolrCloud related attributes on core:
+        collection - The name of the collection this core belongs to. 
+          Defaults to the name of the core.
+        shardId - which shard of the collection this core has.  Defaults
+          to a name derived from host:port_webapp_corename.
+        role - TBD
+    -->
   </cores>
 </solr>

Modified: lucene/solr/branches/cloud/src/webapp/web/admin/index.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/webapp/web/admin/index.jsp?rev=905404&r1=905403&r2=905404&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/webapp/web/admin/index.jsp (original)
+++ lucene/solr/branches/cloud/src/webapp/web/admin/index.jsp Mon Feb  1 20:35:07 2010
@@ -50,6 +50,7 @@
     [<a href="stats.jsp">Statistics</a>]
     [<a href="registry.jsp">Info</a>]
     [<a href="distributiondump.jsp">Distribution</a>]
+    [<a href="zookeeper.jsp">ZooKeeper</a>]
     [<a href="ping">Ping</a>]
     [<a href="logging">Logging</a>]
   </td>