GitHub user AdityaParameshwara opened a pull request: https://github.com/apache/lucene-solr/pull/228
Branch 6 5 You can merge this pull request into a Git repository by running: $ git pull https://github.com/apache/lucene-solr branch_6_5 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/lucene-solr/pull/228.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 #228 ---- commit 1e4463e3a13c5ab71a8df7c48f5106ad38c25bbf Author: Mike McCandless <mikemcc...@apache.org> Date: 2017-02-18T10:56:22Z add example of DrillSidways with range facets commit 3e63a8dc075b72ecb31d5bc104e14b490af48db2 Author: Mike McCandless <mikemcc...@apache.org> Date: 2017-02-18T13:31:26Z add missing javadoc commit 33845f73721c6090163ff869a669557350b8a233 Author: Cao Manh Dat <da...@apache.org> Date: 2017-02-18T23:57:27Z SOLR-9966: Convert/migrate tests using EasyMock to Mockito commit e9d3bdd02ada23ad09bcc6fc7ff3661880dd45bc Author: Ishan Chattopadhyaya <is...@apache.org> Date: 2017-01-26T01:23:13Z SOLR-5944: In-place updates of Numeric DocValues Conflicts: solr/CHANGES.txt solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java solr/core/src/test-files/solr/collection1/conf/schema.xml solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java commit c392d760bd10812a74cc0c5b06ac7617d544743c Author: Ishan Chattopadhyaya <is...@apache.org> Date: 2017-02-07T11:40:52Z SOLR-10079: Test fix for TestInPlaceUpdatesDistrib, using clearIndex() commit 2cd35288ec7e19af93df6275e8d028de0777bd1e Author: Ishan Chattopadhyaya <is...@apache.org> Date: 2017-02-19T01:42:28Z SOLR-10159: When DBQ is reordered with an in-place update, upon whose updated value the DBQ is based on, the DBQ fails due to excessive caching in DeleteByQueryWrapper commit 4de140bf8b5e621ad70a07cb272ddc7135346eaf Author: Ishan Chattopadhyaya <is...@apache.org> Date: 2017-02-19T02:20:01Z SOLR-5944: Use SolrCmdDistributor's synchronous mode for in-place updates commit 476cea57e8e55832878c3b4c8efe1cf6f113b3c4 Author: Ishan Chattopadhyaya <is...@apache.org> Date: 2017-02-19T03:51:35Z SOLR-5944: Cleanup comments and logging, use NoMergePolicy instead of LogDocMergePolicy Conflicts: solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java commit ad9195d757c298a241ef2488b4b17623a44afdd7 Author: yonik <yo...@apache.org> Date: 2017-02-16T03:51:21Z SOLR-10114: add _version_ field to child documents, fix reordered-dbq to not drop child docs commit 5c76710f08225d6909c96e584888bb6f036b4cfe Author: yonik <yo...@apache.org> Date: 2017-02-16T17:45:32Z SOLR-10114: test cleanup commit 98133b21961c7c9672bcd85d2a2713e46f3242db Author: yonik <yo...@apache.org> Date: 2017-02-16T20:12:35Z SOLR-10114: fix flakey TestRecovery commit 76ca4f07a17387f1839e42be9e8e581c94988c80 Author: Cao Manh Dat <da...@apache.org> Date: 2017-02-19T08:19:57Z SOLR-9966: Fix previous commit bug commit 0689b2a7fd05c86c7fc2f1d1adffdd631d671ba1 Author: Ishan Chattopadhyaya <is...@apache.org> Date: 2017-02-19T08:33:32Z SOLR-5944: Suppress PointFields for TestSegmentSorting commit 9a7a05d58d19d3f1051d75ef73ba144742cef934 Author: Ishan Chattopadhyaya <is...@apache.org> Date: 2017-02-19T08:33:44Z Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x commit 7ae5babe1119bef9fa0d6d02b2668a57ca12c21f Author: Ishan Chattopadhyaya <is...@apache.org> Date: 2017-02-19T08:39:15Z Remove unused imports commit 31211d088f9666439017f9a8cdcc5be7d132f751 Author: Cao Manh Dat <da...@apache.org> Date: 2017-02-19T09:52:32Z SOLR-9966: Fix ant precommit by removing cglib commit 54f90d9f4333b6aade8fdb5bbd5b1a4863ba5d9f Author: Cao Manh Dat <da...@apache.org> Date: 2017-02-19T09:54:04Z Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x commit 8a965def6619ab57cdb9418e4158e69479020428 Author: Uwe Schindler <uschind...@apache.org> Date: 2017-02-19T10:40:54Z SOLR-9966: Fix check-licenses precommit commit ccd9733fa24d9c783b544e2cb4a0278ba064e3fc Author: Uwe Schindler <uschind...@apache.org> Date: 2017-02-19T11:20:56Z SOLR-9966: Do test-ignore properly commit f5b324ce6b4c912591d720184d724499575055f2 Author: Chris Hostetter <hoss...@apache.org> Date: 2017-02-20T01:09:35Z Fix (generic) return type w/o this change class won't compile using jdk9-ea157 (cherry picked from commit 5fb94cee68b29bae394fa95753de555cf9ac10ff) commit ea51810733da15ccbc526698742e659c19382fd3 Author: Christine Poerschke <cpoersc...@apache.org> Date: 2017-02-20T10:54:09Z SOLR-10142: turn TestClassNameShortening's @Ignore into @AwaitsFix commit 180614c1491a7e8ffa7b5aba5bab0ad646e2d5f4 Author: Christine Poerschke <cpoersc...@apache.org> Date: 2017-02-20T17:19:54Z LUCENE-7688: Add OneMergeWrappingMergePolicy class. (Keith Laban, Christine Poerschke) commit db83e582f7976563eab76eafdacb5dae716f8aae Author: Christine Poerschke <cpoersc...@apache.org> Date: 2017-02-20T17:38:25Z SOLR-10175: turn TestAnalyticsQParserPlugin's @Ignore into @AwaitsFix commit 017b8a6e2852bcd423661ad457bb623f05bbbf5e Author: markrmiller <markrmil...@apache.org> Date: 2017-02-21T02:27:39Z SOLR-10175: Rename test so it doesn't match test glob pattern. commit cbe7e87d82a5a64fb8b019b215b2c59814ef5462 Author: Alan Woodward <romseyg...@apache.org> Date: 2017-02-19T10:48:37Z LUCENE-7628: Scorer.getChildren() returns only matching child scorers commit c3028b32207b8837cdaf29918edd4e0cdc9621ad Author: Mike McCandless <mikemcc...@apache.org> Date: 2017-02-21T15:51:38Z LUCENE-7465: fix corner case in SimplePattern/SplitTokenizer when lookahead hits end of input commit d8799bc475ca5d384ec49ecf2726aec58e37447b Author: yonik <yo...@apache.org> Date: 2017-02-21T22:14:02Z SOLR-10141: Upgrade to Caffeine 2.4.0 to fix issues with removal listener commit 2d69eb3cf0d7f063d1076809731c669178b99cc7 Author: markrmiller <markrmil...@apache.org> Date: 2017-02-21T23:05:41Z SOLR-10126: @BadApple this test, fails frequently on Jenkins cluster. commit 8dbb1bb3fb64fea4baa672ce82a1b62af22c3571 Author: yonik <yo...@apache.org> Date: 2017-02-21T23:56:16Z SOLR-10121: enable BlockCacheTest.testBlockCacheConcurrent that now passes commit f5ea2022097503df4ed62e59f7d1cb061c8266ee Author: Erick <er...@apache.org> Date: 2017-02-22T06:07:33Z SOLR-10020: CoreAdminHandler silently swallows some errors (cherry picked from commit 14b3622608d3312eca32ba749132ce2f8531326a) ---- --- 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