lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject [2/2] lucene-solr:master: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Date Thu, 21 Apr 2016 12:31:34 GMT
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/2ff8bb0c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2ff8bb0c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2ff8bb0c

Branch: refs/heads/master
Commit: 2ff8bb0c8b65148b5d4043a4e795412c7571e460
Parents: 42b4f04 a9a842f
Author: Karl Wright <DaddyWri@gmail.com>
Authored: Thu Apr 21 08:31:14 2016 -0400
Committer: Karl Wright <DaddyWri@gmail.com>
Committed: Thu Apr 21 08:31:14 2016 -0400

----------------------------------------------------------------------
 .gitignore                                      |   2 +
 dev-tools/idea/.idea/modules.xml                |   1 +
 dev-tools/idea/.idea/workspace.xml              |  13 +-
 dev-tools/idea/solr/server/server.iml           |  19 +
 lucene/CHANGES.txt                              |   8 +
 .../lucene/queries/function/FunctionQuery.java  |  19 +-
 .../queries/TestCustomScoreExplanations.java    |  46 +++
 .../lucene/document/InetAddressPoint.java       |  59 ++-
 .../lucene/document/TestInetAddressPoint.java   |  54 +++
 solr/CHANGES.txt                                |  13 +
 .../org/apache/solr/cloud/ZkController.java     |  17 +-
 .../org/apache/solr/handler/StreamHandler.java  |   9 +-
 .../apache/solr/cloud/hdfs/StressHdfsTest.java  |  17 +-
 .../solr/cloud/overseer/ZkStateReaderTest.java  |  60 +++
 .../client/solrj/io/sql/ConnectionImpl.java     |   6 +-
 .../solrj/io/sql/PreparedStatementImpl.java     | 394 +++++++++++++++++++
 .../solr/client/solrj/io/sql/ResultSetImpl.java |  76 +++-
 .../solr/client/solrj/io/sql/StatementImpl.java |  56 ++-
 .../apache/solr/common/cloud/ZkStateReader.java |  36 +-
 .../solr/client/solrj/io/sql/JdbcTest.java      |  67 +++-
 solr/webapp/web/css/angular/stream.css          |  14 +-
 .../webapp/web/js/angular/controllers/stream.js |  23 +-
 solr/webapp/web/partials/stream.html            |   2 +-
 23 files changed, 895 insertions(+), 116 deletions(-)
----------------------------------------------------------------------



Mime
View raw message