GitHub user jitka18 opened a pull request:
https://github.com/apache/lucene-solr/pull/188
Jira/solr 6203
Hello, Christine. I merged from master through commit 00f0c3022baa0b7 to
my fork of the jira/solr-6203 branch, resolved a conflict in
TopGroupsFieldCommand.java, and committed. All unit tests pass, including the
ones I added to test the fix which is the subject of this Jira.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/jitka18/lucene-solr jira/solr-6203
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/lucene-solr/pull/188.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #188
----
commit 859eb0837f52d131924ce8401c4ae1dc3056b7de
Author: Christine Poerschke <[email protected]>
Date: 2016-11-29T21:42:51Z
SOLR-6203: starting working branch
commit 99e2e3d42400558aa1f404f27dd4e15350a85559
Author: Christine Poerschke <[email protected]>
Date: 2016-12-01T20:51:47Z
SOLR-6203: applied Judith Silverman's latest patch to working branch
commit 6043210356d19b32dea1f6a03401839c191a9b0f
Author: Christine Poerschke <[email protected]>
Date: 2016-12-01T09:00:07Z
SOLR-6203: added reply to question in
SearchGroupShardResponseProcess.process
commit 6476f286799c8aebe2fe81563b8976470145440c
Author: Christine Poerschke <[email protected]>
Date: 2016-12-01T20:58:12Z
SOLR-6203: added reply to would-be-nice todo/comment/question in
grouping/Command.java
commit 9090c6f67d2ae59a6197b56fb4e7676ddce895b1
Author: Christine Poerschke <[email protected]>
Date: 2017-02-24T18:17:19Z
SOLR-6203: applied Judith's Dec5th patch
commit af74958781848d25c46b8d35d4eb286c32fe9b5e
Author: Christine Poerschke <[email protected]>
Date: 2017-02-24T19:07:36Z
Merge remote-tracking branch 'origin/master' into jira/solr-6203
Conflicts Resolved (Hopefully):
solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
commit 2cd3f71d1b86ccff38c35ccedbd729ff0fc25fb5
Author: Christine Poerschke <[email protected]>
Date: 2017-02-24T19:30:15Z
SOLR-6203: post merge follow-ups
commit 1644fe873e7597306a24bb91a97b1a9beba4b8ef
Author: Judith Silverman <[email protected]>
Date: 2017-03-27T00:47:11Z
Merge remote-tracking branch 'origin/master' into jira/solr-6203;
resolved conflicts in SeardhGroupsResultTransformer.java
commit e94b8c6382af64bcdd084eb9e92094afda297f09
Author: Judith Silverman <[email protected]>
Date: 2017-03-29T02:56:20Z
DistributedQueryComponentCustomSortTest.java: replacing duplicated tests
commit 770265fb33178e4002bee6c67e710cff37a46751
Author: Christine Poerschke <[email protected]>
Date: 2017-03-30T16:18:22Z
Merge branch 'master' into jira/solr-6203
Yet To Be Resolved Conflicts:
solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
commit caed03da40ae9ba2795846add2c14588a97ea78d
Author: Christine Poerschke <[email protected]>
Date: 2017-03-30T16:26:28Z
resolve SearchGroupsResultTransformer merge conflict
commit 92b76abdd2ec85d9d36c66922107f4efbe6bc0b4
Author: Christine Poerschke <[email protected]>
Date: 2017-03-30T17:33:48Z
remove Sort setters in (Search|Top)GroupsFieldCommand.Builder (in favour of
SortSpec setters)
commit 832653ae905f9e3cf4643be0d5df5f32c7b00599
Author: Christine Poerschke <[email protected]>
Date: 2017-04-04T15:20:40Z
Merge branch 'master' into jira/solr-6203
Resolved Conflicts:
solr/core/src/java/org/apache/solr/search/grouping/Command.java
solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java
commit 3325cfa2fe9c470e5ba71a4350f6226ed07646bd
Author: Christine Poerschke <[email protected]>
Date: 2017-04-07T15:34:42Z
Merge branch 'master' into jira/solr-6203
commit 3649e8f93006f425ebe81427282d3e0843656824
Author: Judith Silverman <[email protected]>
Date: 2017-04-08T02:46:27Z
Merge branch 'jira/solr-6203' of https://github.com/apache/lucene-solr
into jira/solr-6203 after resolving whitespace conflict in
SearchGroupsResultTransformer.java
commit 4e678ccc85f1f0e758aecebdc9a34e497ffc0a81
Author: Judith Silverman <[email protected]>
Date: 2017-04-16T16:34:21Z
Merge remote-tracking branch 'upstream/master' into jira/solr-6203.
Resolve conflict in TopGroupsFieldCommand.java.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
