You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2016/12/13 20:30:29 UTC
[22/42] lucene-solr:feature/metrics: Merge remote-tracking branch
'origin/master'
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/10500c89
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/10500c89
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/10500c89
Branch: refs/heads/feature/metrics
Commit: 10500c894da171b6826e5101a981283ec434b9de
Parents: 3f6164c 8b98b15
Author: Noble Paul <no...@apache.org>
Authored: Wed Dec 7 18:42:39 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed Dec 7 18:42:39 2016 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 4 +
.../uhighlight/MemoryIndexOffsetStrategy.java | 10 +-
.../uhighlight/MultiTermHighlighting.java | 37 +--
.../lucene/search/uhighlight/PhraseHelper.java | 158 ++++++++---
.../search/uhighlight/UnifiedHighlighter.java | 64 +++--
.../uhighlight/TestUnifiedHighlighter.java | 275 +++++++++++++++++++
.../TestUnifiedHighlighterExtensibility.java | 3 +-
solr/CHANGES.txt | 9 +
.../src/java/org/apache/solr/core/SolrCore.java | 8 -
.../solr/handler/admin/SystemInfoHandler.java | 51 +++-
.../solr/schema/ManagedIndexSchemaFactory.java | 12 +
.../org/apache/solr/schema/SchemaManager.java | 2 +-
.../ManagedSchemaRoundRobinCloudTest.java | 98 +++++++
.../solrj/impl/ConcurrentUpdateSolrClient.java | 16 +-
.../solr/client/solrj/SolrExampleTests.java | 7 +-
15 files changed, 649 insertions(+), 105 deletions(-)
----------------------------------------------------------------------