You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/11/26 06:55:18 UTC
[1/2] lucene-solr:master: SOLR-9784: removed unused method
Repository: lucene-solr
Updated Branches:
refs/heads/master eded69ba8 -> 346e76659
SOLR-9784: removed unused method
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/dce5964d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dce5964d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dce5964d
Branch: refs/heads/master
Commit: dce5964d8a19c288b34b7671bcfeb2844d83d882
Parents: 950ff50
Author: Noble Paul <no...@apache.org>
Authored: Sat Nov 26 12:24:45 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Sat Nov 26 12:24:45 2016 +0530
----------------------------------------------------------------------
.../solr/client/solrj/impl/CloudSolrClient.java | 30 --------------------
1 file changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dce5964d/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index 241e2a1..6e4a256 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@ -1566,37 +1566,7 @@ public class CloudSolrClient extends SolrClient {
return lbClient;
}
-
- private static String buildZkHostString(Collection<String> zkHosts, String chroot) {
- if (zkHosts == null || zkHosts.isEmpty()) {
- throw new IllegalArgumentException("Cannot create CloudSearchClient without valid ZooKeeper host; none specified!");
- }
-
- StringBuilder zkBuilder = new StringBuilder();
- int lastIndexValue = zkHosts.size() - 1;
- int i = 0;
- for (String zkHost : zkHosts) {
- zkBuilder.append(zkHost);
- if (i < lastIndexValue) {
- zkBuilder.append(",");
- }
- i++;
- }
- if (chroot != null) {
- if (chroot.startsWith("/")) {
- zkBuilder.append(chroot);
- } else {
- throw new IllegalArgumentException(
- "The chroot must start with a forward slash.");
- }
- }
- /* Log the constructed connection string and then initialize. */
- final String zkHostString = zkBuilder.toString();
- log.debug("Final constructed zkHost string: " + zkHostString);
- return zkHostString;
- }
-
/**
* Constructs {@link CloudSolrClient} instances from provided configuration.
*/
[2/2] lucene-solr:master: Merge remote-tracking branch 'origin/master'
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/346e7665
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/346e7665
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/346e7665
Branch: refs/heads/master
Commit: 346e7665995a8f087a1cac7fee00f0a35abd83b6
Parents: dce5964 eded69b
Author: Noble Paul <no...@apache.org>
Authored: Sat Nov 26 12:25:06 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Sat Nov 26 12:25:06 2016 +0530
----------------------------------------------------------------------
.../apache/lucene/index/TestIndexSorting.java | 5 ++++-
lucene/ivy-versions.properties | 2 +-
...jetty-continuation-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-continuation-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-http-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-http-9.3.8.v20160314.jar.sha1 | 1 -
.../licenses/jetty-io-9.3.14.v20161028.jar.sha1 | 1 +
.../licenses/jetty-io-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-server-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-server-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-servlet-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-servlet-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-util-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-util-9.3.8.v20160314.jar.sha1 | 1 -
solr/CHANGES.txt | 4 +++-
.../conf/schema-unifiedhighlight.xml | 20 +-------------------
.../handler/admin/CoreAdminHandlerTest.java | 2 ++
...jetty-continuation-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-continuation-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-deploy-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-deploy-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-http-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-http-9.3.8.v20160314.jar.sha1 | 1 -
.../licenses/jetty-io-9.3.14.v20161028.jar.sha1 | 1 +
solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-jmx-9.3.14.v20161028.jar.sha1 | 1 +
.../licenses/jetty-jmx-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-rewrite-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-rewrite-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-security-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-security-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-server-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-server-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-servlet-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-servlet-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-servlets-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-servlets-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-util-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-util-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-webapp-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-webapp-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-xml-9.3.14.v20161028.jar.sha1 | 1 +
.../licenses/jetty-xml-9.3.8.v20160314.jar.sha1 | 1 -
solr/licenses/start.jar.sha1 | 2 +-
44 files changed, 31 insertions(+), 42 deletions(-)
----------------------------------------------------------------------