You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2018/12/14 15:43:38 UTC
[1/2] lucene-solr:master: SOLR-12727: Fix tests to work with
'interesting' entries in the hosts file like 'fe80::1%lo0 localhost'
Repository: lucene-solr
Updated Branches:
refs/heads/master bfd28a8b3 -> 3ca7e6538
SOLR-12727: Fix tests to work with 'interesting' entries in the hosts file like 'fe80::1%lo0 localhost'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/15b36299
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/15b36299
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/15b36299
Branch: refs/heads/master
Commit: 15b36299c49ab0fb933ffada6eed8b40d47844c1
Parents: f844461
Author: Erick Erickson <Er...@gmail.com>
Authored: Fri Dec 14 07:42:57 2018 -0800
Committer: Erick Erickson <Er...@gmail.com>
Committed: Fri Dec 14 07:42:57 2018 -0800
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/ZkTestServer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15b36299/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index 8aa1e7d..f52e231 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -456,7 +456,7 @@ public class ZkTestServer {
}
public String getZkHost() {
- return "localhost:" + zkServer.getLocalPort();
+ return "127.0.0.1:" + zkServer.getLocalPort();
}
public String getZkAddress() {
@@ -471,7 +471,7 @@ public class ZkTestServer {
public String getZkAddress(String chroot) {
if (!chroot.startsWith("/"))
chroot = "/" + chroot;
- return "localhost:" + zkServer.getLocalPort() + chroot;
+ return "127.0.0.1:" + zkServer.getLocalPort() + chroot;
}
/**
[2/2] lucene-solr:master: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Posted by er...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3ca7e653
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3ca7e653
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3ca7e653
Branch: refs/heads/master
Commit: 3ca7e65388a124696f4d9c50a82dab795f1ff986
Parents: 15b3629 bfd28a8
Author: Erick Erickson <Er...@gmail.com>
Authored: Fri Dec 14 07:43:06 2018 -0800
Committer: Erick Erickson <Er...@gmail.com>
Committed: Fri Dec 14 07:43:06 2018 -0800
----------------------------------------------------------------------
.../index/TestBackwardsCompatibility.java | 7 +++++--
.../org/apache/lucene/index/index.7.6.0-cfs.zip | Bin 0 -> 15655 bytes
.../apache/lucene/index/index.7.6.0-nocfs.zip | Bin 0 -> 15649 bytes
.../org/apache/lucene/index/sorted.7.6.0.zip | Bin 0 -> 74541 bytes
solr/CHANGES.txt | 4 ++++
.../apache/solr/cloud/MiniSolrCloudCluster.java | 19 ++++---------------
solr/webapp/web/js/angular/app.js | 2 +-
solr/webapp/web/js/angular/controllers/query.js | 3 ++-
solr/webapp/web/js/angular/services.js | 2 +-
9 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------