You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2017/06/29 11:16:13 UTC
[1/2] lucene-solr:branch_6x: SOLR-10973: Use the correct constructor
for InputStreamBody.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 7f279bba2 -> 48cdc74be
SOLR-10973: Use the correct constructor for InputStreamBody.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fdd6205d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fdd6205d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fdd6205d
Branch: refs/heads/branch_6x
Commit: fdd6205df9054c0498bd8846d66db6f30d5d8476
Parents: 7f279bb
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Jun 29 04:58:51 2017 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Jun 29 05:15:26 2017 -0400
----------------------------------------------------------------------
.../src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fdd6205d/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index 84e89a5..d204025 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -419,7 +419,7 @@ public class HttpSolrClient extends SolrClient {
parts.add(new FormBodyPart(name,
new InputStreamBody(
content.getStream(),
- contentType,
+ ContentType.parse(contentType),
content.getName())));
}
}
[2/2] lucene-solr:branch_6x: Get solr core classes to build again
Posted by kw...@apache.org.
Get solr core classes to build again
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/48cdc74b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/48cdc74b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/48cdc74b
Branch: refs/heads/branch_6x
Commit: 48cdc74bea325fa576cde96bc685edd647b0013c
Parents: fdd6205
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Jun 29 07:15:59 2017 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Jun 29 07:15:59 2017 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/core/SolrCore.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/48cdc74b/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index c02c748..e60f9dd 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2833,7 +2833,7 @@ public final class SolrCore implements SolrInfoMBean, SolrMetricProducer, Closea
CoreDescriptor cd = getCoreDescriptor();
if (cd != null) {
if (coreContainer != null) {
- lst.add("aliases", coreContainer.getCoreNames(this));
+ lst.add("aliases", coreContainer.getNamesForCore(this));
}
CloudDescriptor cloudDesc = cd.getCloudDescriptor();
if (cloudDesc != null) {