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/29 02:39:12 UTC
[1/2] lucene-solr:branch_6x: SOLR-9784: added deprecation javadocs
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x ec385708c -> 7a9f83496
SOLR-9784: added deprecation javadocs
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d89da61a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d89da61a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d89da61a
Branch: refs/heads/branch_6x
Commit: d89da61a6dfed2cec5b2232ae978ebd71f1216de
Parents: 00dfbaf
Author: Noble Paul <no...@apache.org>
Authored: Tue Nov 29 08:05:47 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Nov 29 08:08:02 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/solr/client/solrj/impl/CloudSolrClient.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d89da61a/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 07238c1..279708b 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
@@ -645,6 +645,8 @@ public class CloudSolrClient extends SolrClient {
* are allowing client access to zookeeper, you should protect the
* /configs node against unauthorised write access.
*
+ * @deprecated Please use {@link ZkClientClusterStateProvider#uploadConfig(Path, String)} instead
+ *
* @param configPath {@link java.nio.file.Path} to the config files
* @param configName the name of the config
* @throws IOException if an IO error occurs
@@ -665,6 +667,8 @@ public class CloudSolrClient extends SolrClient {
/**
* Download a named config from Zookeeper to a location on the filesystem
+ *
+ * @deprecated Please use {@link ZkClientClusterStateProvider#downloadConfig(String, Path)} instead
* @param configName the name of the config
* @param downloadPath the path to write config files to
* @throws IOException if an I/O exception occurs
[2/2] lucene-solr:branch_6x: Merge branch 'branch_6x' of
https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Posted by no...@apache.org.
Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7a9f8349
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a9f8349
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a9f8349
Branch: refs/heads/branch_6x
Commit: 7a9f834966057027674efb91be8d5415d35e5a22
Parents: d89da61 ec38570
Author: Noble Paul <no...@apache.org>
Authored: Tue Nov 29 08:08:31 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Nov 29 08:08:31 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 4 +
solr/bin/solr | 80 ++-
solr/bin/solr.cmd | 72 ++-
solr/bin/solr.in.cmd | 6 +-
solr/bin/solr.in.sh | 4 +
.../org/apache/solr/request/NumericFacets.java | 4 +-
.../solr/cloud/DocValuesNotIndexedTest.java | 527 +++++++++++++++++++
solr/server/etc/jetty-ssl.xml | 4 +-
8 files changed, 677 insertions(+), 24 deletions(-)
----------------------------------------------------------------------