You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by eljuanchi07 <gi...@git.apache.org> on 2015/02/12 13:29:50 UTC
[GitHub] lucene-solr pull request: Branch 3x
GitHub user eljuanchi07 opened a pull request:
https://github.com/apache/lucene-solr/pull/128
Branch 3x
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/lucene-solr branch_3x
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/lucene-solr/pull/128.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 #128
----
commit 23def5ee3654c0485076b5b1f1b14a5e5959fdfd
Author: Chris M. Hostetter <ho...@apache.org>
Date: 2012-03-08T23:47:31Z
typo merge r1298654 from trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298655 13f79535-47bb-0310-9956-ffa450edef68
commit 0e092232713f02ec24479c6d29d0f06b9a8f23ac
Author: Chris M. Hostetter <ho...@apache.org>
Date: 2012-03-09T00:36:36Z
SOLR-3077: Better error messages when attempting to use 'blank' field names (merge 1298667 from trunk)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298668 13f79535-47bb-0310-9956-ffa450edef68
commit 04650f47d0a3eb959566aaac678955f6afe2f0dc
Author: Ryan McKinley <ry...@apache.org>
Date: 2012-03-09T01:33:47Z
SOLR-2712: expecting fl=score to return all fields is now deprecated.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298683 13f79535-47bb-0310-9956-ffa450edef68
commit 1630379139737d3436301ca102d35677b5d369b2
Author: Dawid Weiss <dw...@apache.org>
Date: 2012-03-09T08:06:08Z
Class rule to store the currently executing test class. Removed Solr's code that pulled this from the stack frames (which wasn't working because rules wrap the actual test code).
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298736 13f79535-47bb-0310-9956-ffa450edef68
commit de6c7e79f97fc6ac358153f1e13dd5f50f08cb49
Author: Dawid Weiss <dw...@apache.org>
Date: 2012-03-09T08:06:41Z
LUCENE-3857: exceptions from other threads in beforeclass/etc do not fail
the test (Dawid Weiss)
Conflicts:
lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298738 13f79535-47bb-0310-9956-ffa450edef68
commit 1d6fb1514b159e1e1e93b12cc5a29b9fb3b22f34
Author: Dawid Weiss <dw...@apache.org>
Date: 2012-03-09T08:50:32Z
@Override on interfaces.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298753 13f79535-47bb-0310-9956-ffa450edef68
commit 217a39ab88d4b3773c9bc9f894e530d6c4a3353a
Author: Dawid Weiss <dw...@apache.org>
Date: 2012-03-09T09:14:33Z
Wait for the thread to fail in beforeclass.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298762 13f79535-47bb-0310-9956-ffa450edef68
commit 2ffd2b66bd62b80a546860894871887e81f8ec2a
Author: Robert Muir <rm...@apache.org>
Date: 2012-03-09T14:42:01Z
LUCENE-3858: clean dist folder too when running ant clean
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298853 13f79535-47bb-0310-9956-ffa450edef68
commit 6e3f7ac9885267863218d80bc85d6f47922d52f8
Author: Dawid Weiss <dw...@apache.org>
Date: 2012-03-09T17:00:52Z
Don't load the class before evaluation of a subrule, invoke lazily.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298926 13f79535-47bb-0310-9956-ffa450edef68
commit c48b60e2c52c78e26ffc1a1cd0b314ecad415ebe
Author: Robert Muir <rm...@apache.org>
Date: 2012-03-09T18:36:14Z
LUCENE-3680: more exception consistency in o.a.l.store
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298969 13f79535-47bb-0310-9956-ffa450edef68
commit a20a5de5ba4e0064fe726fd0bbcc779d6c87c9c3
Author: Robert Muir <rm...@apache.org>
Date: 2012-03-09T18:43:38Z
LUCENE-3680: this is a closeable
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1298973 13f79535-47bb-0310-9956-ffa450edef68
commit 7fa445e195b6e3f944d48296cb87bbb78f25d7f3
Author: Doron Cohen <do...@apache.org>
Date: 2012-03-09T22:24:27Z
LUCENE-3821: SloppyPhraseScorer missed documents that ExactPhraseScorer finds
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1299077 13f79535-47bb-0310-9956-ffa450edef68
commit d9e39315f967e4c5283462fe7ecbcb6c9a95cb4c
Author: Jan Høydahl <ja...@apache.org>
Date: 2012-03-10T08:21:34Z
SOLR-2202: Money/Currency FieldType backport
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1299159 13f79535-47bb-0310-9956-ffa450edef68
commit 719701bdac52293cc3a9e668be09a7e67aee860c
Author: Christian Moen <cm...@apache.org>
Date: 2012-03-10T14:54:47Z
Kuromoji now generates compounds and the segmentations of these compounds in search mode (backport of LUCENE-3767)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1299213 13f79535-47bb-0310-9956-ffa450edef68
commit b935a326487034a91c1615ea3e11190584c84905
Author: Robert Muir <rm...@apache.org>
Date: 2012-03-11T16:15:25Z
LUCENE-3859: javadocs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1299386 13f79535-47bb-0310-9956-ffa450edef68
commit 5d4645661160fe702db1da6df1092b6d51daa3c1
Author: Jan Høydahl <ja...@apache.org>
Date: 2012-03-12T10:23:45Z
SOLR-2202: Avoid dependency on "tlong" and "string" in schema, add precisionStep param
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1299615 13f79535-47bb-0310-9956-ffa450edef68
commit 8eb7de2c8823b7984635ce90fffb69e89b7286bc
Author: Jan Høydahl <ja...@apache.org>
Date: 2012-03-12T13:14:40Z
SOLR-3026: eDismax: Locking down which fields can be explicitly queried (user fields aka uf)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1299665 13f79535-47bb-0310-9956-ffa450edef68
commit 9735fbd73a70159e23056668e13663351273cd09
Author: Robert Muir <rm...@apache.org>
Date: 2012-03-12T13:37:12Z
add very basic random spans tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1299672 13f79535-47bb-0310-9956-ffa450edef68
commit 400caa62ada327af3a2370b8057caae5e574a9bd
Author: Koji Sekiguchi <ko...@apache.org>
Date: 2012-03-12T14:20:34Z
fix javadoc: use Writer, Util.toDot() and prettify
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1299679 13f79535-47bb-0310-9956-ffa450edef68
commit 4ee41b20bf51e27f4ba5e4737bf2560695ef57f5
Author: Jan Høydahl <ja...@apache.org>
Date: 2012-03-13T12:49:35Z
SOLR-2826: URLClassify Update Processor
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300104 13f79535-47bb-0310-9956-ffa450edef68
commit e920d4d31e49afed998ead5388ba10332cd1f03b
Author: Erick Erickson <er...@apache.org>
Date: 2012-03-13T14:44:45Z
Fix for SOLR-3221: "Make Shard handler threadpool configurable"
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300158 13f79535-47bb-0310-9956-ffa450edef68
commit 695c0f1609e23f99e56b4caa106b44af78864f13
Author: Erick Erickson <er...@apache.org>
Date: 2012-03-13T14:56:16Z
Fix for SOLR-3236, javadoc only
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300167 13f79535-47bb-0310-9956-ffa450edef68
commit 68b0f1bc69b7eeed668a4df19258d9de1a78a061
Author: David Wayne Smiley <ds...@apache.org>
Date: 2012-03-13T15:36:49Z
SOLR-3161 disable qt by default in solrconfig; update admin UI query form
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300195 13f79535-47bb-0310-9956-ffa450edef68
commit 238cde0b1256d81feae327b231edcaa6c30ef5d7
Author: Michael McCandless <mi...@apache.org>
Date: 2012-03-14T15:43:00Z
LUCENE-3841: fix CloseableThreadLocal to also purge entries periodically in get(), to avoid holding onto objects for too long
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300596 13f79535-47bb-0310-9956-ffa450edef68
commit c24596be834ace9d45d83f60cef55d62583b7491
Author: Michael McCandless <mi...@apache.org>
Date: 2012-03-14T17:43:06Z
SOLR-3076: fix ToChildBlockJoinQuery to correctly apply acceptDocs per-child
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300660 13f79535-47bb-0310-9956-ffa450edef68
commit 71862b9a75844f557b6a7287fa6d8e2ec0868486
Author: Robert Muir <rm...@apache.org>
Date: 2012-03-14T18:04:02Z
SOLR-3241: document/field boosts would fail if you copyField from a norms field to an omitNorms field
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300667 13f79535-47bb-0310-9956-ffa450edef68
commit b189e3cb84f390950e5239b08f5d0fd83c92b183
Author: Michael McCandless <mi...@apache.org>
Date: 2012-03-14T22:12:38Z
LUCENE-3841: restore fillSliceWithPrefix's ability to span 2 blocks
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300756 13f79535-47bb-0310-9956-ffa450edef68
commit e3552c0a6a6cc8e1383368bf77d6bbc1a34e1b25
Author: Dawid Weiss <dw...@apache.org>
Date: 2012-03-15T08:13:20Z
LUCENE-3871: Dump full stack on failure. If you feel uncomfortable with long stack traces contact me and I will soothe you :)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1300840 13f79535-47bb-0310-9956-ffa450edef68
commit d187f1bc8bcf79eaf647847bf3ba97afed99dab8
Author: Erick Erickson <er...@apache.org>
Date: 2012-03-15T17:11:36Z
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1301096 13f79535-47bb-0310-9956-ffa450edef68
commit 017508a3613f290b5521841e24afa3b1bb28cdba
Author: Michael McCandless <mi...@apache.org>
Date: 2012-03-15T18:58:10Z
fix IW infoStream (already fixed on trunk)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1301146 13f79535-47bb-0310-9956-ffa450edef68
----
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
[GitHub] lucene-solr pull request: Branch 3x
Posted by hossman <gi...@git.apache.org>.
Github user hossman commented on the pull request:
https://github.com/apache/lucene-solr/pull/128#issuecomment-74110665
This PR doesn't even remotley make sense ... i suspectit was created by mistake?
please close and if you have some specific suggestions for changes to lucene that this PR was intended to represent, write & send an email to the dev@lucene (apache.org) mailing list procposing your suggestions.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
[GitHub] lucene-solr pull request: Branch 3x
Posted by elyograg <gi...@git.apache.org>.
Github user elyograg commented on the pull request:
https://github.com/apache/lucene-solr/pull/128#issuecomment-74073810
I don't think this is going to happen, for a few reasons:
1) branch_3x no longer exists in the current repositories. Neither does branch_4x. The current stable development branch is branch_5x.
2) The 3x branch was deleted a LONG time ago. The amount of change in trunk since then is *enormous*, so the merging will NOT be clean. Conflict resolution will be manual and very tedious.
3) Almost all commits on a stable branch like branch_3x are already in trunk, because that's how we do development - changes are applied to trunk and then backported to whatever the stable branch is at the time. I would be willing to bet that almost all of the changes you have listed here are already in trunk. This fact probably causes even more merge conflicts than the age of branch_3x, and means that most of these changes are completely unnecessary.
4) This patch is HUGE. Nobody will agree to merge anything unless it makes a discrete change that can be easily analyzed to determine what's being done and how it benefits the project. Very large changes must be broken up into much smaller changes.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org