You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/10/26 18:45:15 UTC
[3/3] lucene-solr:jira/solr-8542-v2: Merge branch 'master' into
jira/solr-8542-v2
Merge branch 'master' into jira/solr-8542-v2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f3aca41c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f3aca41c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f3aca41c
Branch: refs/heads/jira/solr-8542-v2
Commit: f3aca41c9f2f18e5179c2997b212828723d705f9
Parents: 03fe52c 7794fbd
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Oct 26 13:44:30 2016 -0500
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Oct 26 13:44:30 2016 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +
.../handler/admin/SecurityConfHandlerLocal.java | 3 +-
.../solr/handler/component/QueryComponent.java | 7 ++-
.../java/org/apache/solr/search/Grouping.java | 4 +-
.../TopGroupsShardResponseProcessor.java | 9 ++-
.../apache/solr/TestDistributedGrouping.java | 59 ++++++++++----------
.../SecurityConfHandlerLocalForTesting.java | 4 --
.../solr/security/BasicAuthStandaloneTest.java | 1 -
8 files changed, 50 insertions(+), 40 deletions(-)
----------------------------------------------------------------------