GitHub user PaulElschot opened a pull request:
https://github.com/apache/lucene-solr/pull/42
Lucene 5092 pull 4
LUCENE-5092
Resolved small conflict in ToChildBlockJoinQuery after LUCENE-5520
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/PaulElschot/lucene-solr LUCENE-5092-pull-4
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/lucene-solr/pull/42.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 #42
----
commit 77f73ac206e8ad85bc7706424a7cc181eb73e8a9
Author: Paul Elschot <paul.j.elsc...@gmail.com>
Date: 2014-02-19T20:31:03Z
Squashed commit for LUCENE-5092
commit 767a34f00beff849ebe07554bcc1930da2c474b4
Author: Paul Elschot <paul.j.elsc...@gmail.com>
Date: 2014-03-13T16:58:56Z
Merge branch 'trunk' into LUCENE-5092-pull-4
Conflicts:
lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org
For additional commands, e-mail: dev-h...@lucene.apache.org
