You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2016/06/28 10:30:32 UTC
[2/2] lucene-solr:branch_6x: Merge branch 'branch_6x' of
https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d0346d60
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d0346d60
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d0346d60
Branch: refs/heads/branch_6x
Commit: d0346d606e3282997c96ec7a3df12a34471a9d11
Parents: cd1fada 09a7e4d
Author: Karl Wright <Da...@gmail.com>
Authored: Tue Jun 28 06:29:56 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Tue Jun 28 06:29:56 2016 -0400
----------------------------------------------------------------------
dev-tools/scripts/addBackcompatIndexes.py | 30 +-
dev-tools/scripts/addVersion.py | 19 +-
dev-tools/scripts/releasedJirasRegex.py | 93 ++++
dev-tools/scripts/scriptutil.py | 7 +-
lucene/CHANGES.txt | 59 +++
.../lucene/analysis/minhash/MinHashFilter.java | 504 +++++++++++++++++++
.../analysis/minhash/MinHashFilterFactory.java | 57 +++
.../lucene/analysis/minhash/package-info.java | 21 +
...ache.lucene.analysis.util.TokenFilterFactory | 1 +
.../analysis/minhash/MinHashFilterTest.java | 330 ++++++++++++
.../index/TestBackwardsCompatibility.java | 2 +
.../org/apache/lucene/index/index.5.5.2-cfs.zip | Bin 0 -> 13722 bytes
.../apache/lucene/index/index.5.5.2-nocfs.zip | Bin 0 -> 13724 bytes
.../java/org/apache/lucene/util/Version.java | 7 +
lucene/ivy-versions.properties | 12 +-
.../org/apache/lucene/search/CheckHits.java | 6 +-
solr/CHANGES.txt | 240 ++++++++-
.../apache/solr/hadoop/SolrRecordWriter.java | 7 +-
.../solr/hadoop/TreeMergeOutputFormat.java | 5 +-
solr/contrib/morphlines-core/ivy.xml | 5 +-
solr/core/ivy.xml | 8 +-
.../cloud/OverseerCollectionMessageHandler.java | 4 +-
.../org/apache/solr/core/CoreContainer.java | 9 +
.../apache/solr/core/HdfsDirectoryFactory.java | 13 +-
.../java/org/apache/solr/core/NodeConfig.java | 20 +-
.../org/apache/solr/core/SolrXmlConfig.java | 12 +
.../backup/repository/BackupRepository.java | 166 ++++++
.../repository/BackupRepositoryFactory.java | 89 ++++
.../backup/repository/HdfsBackupRepository.java | 159 ++++++
.../repository/LocalFileSystemRepository.java | 136 +++++
.../core/backup/repository/package-info.java | 23 +
.../apache/solr/handler/OldBackupDirectory.java | 55 +-
.../apache/solr/handler/ReplicationHandler.java | 61 ++-
.../org/apache/solr/handler/RestoreCore.java | 22 +-
.../org/apache/solr/handler/SnapShooter.java | 153 +++---
.../solr/handler/admin/CollectionsHandler.java | 4 +-
.../solr/handler/admin/CoreAdminOperation.java | 42 +-
.../solr/highlight/DefaultSolrHighlighter.java | 15 +-
.../solr/store/blockcache/BlockDirectory.java | 5 +-
.../store/blockcache/BlockDirectoryCache.java | 5 +-
.../solr/store/blockcache/BufferStore.java | 2 +-
.../blockcache/CustomBufferedIndexInput.java | 2 +-
.../apache/solr/store/hdfs/HdfsDirectory.java | 26 +-
.../apache/solr/store/hdfs/HdfsFileReader.java | 105 ----
.../org/apache/solr/update/HdfsUpdateLog.java | 6 -
.../solr/collection1/conf/solrconfig.xml | 5 +-
solr/core/src/test-files/solr/solr-50-all.xml | 4 +
.../solr/cloud/BasicDistributedZk2Test.java | 27 +-
.../solr/core/TestBackupRepositoryFactory.java | 152 ++++++
.../org/apache/solr/core/TestLazyCores.java | 4 +-
.../test/org/apache/solr/core/TestSolrXml.java | 13 +
.../apache/solr/handler/BackupRestoreUtils.java | 67 +++
.../apache/solr/handler/CheckBackupStatus.java | 10 +-
.../solr/handler/TestHdfsBackupRestoreCore.java | 251 +++++++++
.../handler/TestReplicationHandlerBackup.java | 39 +-
.../apache/solr/handler/TestRestoreCore.java | 52 +-
.../solr/index/hdfs/CheckHdfsIndexTest.java | 3 +-
.../solr/store/hdfs/HdfsDirectoryTest.java | 3 +-
solr/licenses/hadoop-annotations-2.6.0.jar.sha1 | 1 -
solr/licenses/hadoop-annotations-2.7.2.jar.sha1 | 1 +
solr/licenses/hadoop-auth-2.6.0.jar.sha1 | 1 -
solr/licenses/hadoop-auth-2.7.2.jar.sha1 | 1 +
.../licenses/hadoop-common-2.6.0-tests.jar.sha1 | 1 -
solr/licenses/hadoop-common-2.6.0.jar.sha1 | 1 -
.../licenses/hadoop-common-2.7.2-tests.jar.sha1 | 1 +
solr/licenses/hadoop-common-2.7.2.jar.sha1 | 1 +
solr/licenses/hadoop-hdfs-2.6.0-tests.jar.sha1 | 1 -
solr/licenses/hadoop-hdfs-2.6.0.jar.sha1 | 1 -
solr/licenses/hadoop-hdfs-2.7.2-tests.jar.sha1 | 1 +
solr/licenses/hadoop-hdfs-2.7.2.jar.sha1 | 1 +
.../hadoop-mapreduce-client-app-2.6.0.jar.sha1 | 1 -
.../hadoop-mapreduce-client-app-2.7.2.jar.sha1 | 1 +
...adoop-mapreduce-client-common-2.6.0.jar.sha1 | 1 -
...adoop-mapreduce-client-common-2.7.2.jar.sha1 | 1 +
.../hadoop-mapreduce-client-core-2.6.0.jar.sha1 | 1 -
.../hadoop-mapreduce-client-core-2.7.2.jar.sha1 | 1 +
.../hadoop-mapreduce-client-hs-2.6.0.jar.sha1 | 1 -
.../hadoop-mapreduce-client-hs-2.7.2.jar.sha1 | 1 +
...reduce-client-jobclient-2.6.0-tests.jar.sha1 | 1 -
...op-mapreduce-client-jobclient-2.6.0.jar.sha1 | 1 -
...reduce-client-jobclient-2.7.2-tests.jar.sha1 | 1 +
...op-mapreduce-client-jobclient-2.7.2.jar.sha1 | 1 +
...doop-mapreduce-client-shuffle-2.6.0.jar.sha1 | 1 -
...doop-mapreduce-client-shuffle-2.7.2.jar.sha1 | 1 +
solr/licenses/hadoop-minikdc-2.6.0.jar.sha1 | 1 -
solr/licenses/hadoop-minikdc-2.7.2.jar.sha1 | 1 +
solr/licenses/hadoop-yarn-api-2.6.0.jar.sha1 | 1 -
solr/licenses/hadoop-yarn-api-2.7.2.jar.sha1 | 1 +
solr/licenses/hadoop-yarn-client-2.6.0.jar.sha1 | 1 -
solr/licenses/hadoop-yarn-client-2.7.2.jar.sha1 | 1 +
solr/licenses/hadoop-yarn-common-2.6.0.jar.sha1 | 1 -
solr/licenses/hadoop-yarn-common-2.7.2.jar.sha1 | 1 +
...ver-applicationhistoryservice-2.6.0.jar.sha1 | 1 -
...ver-applicationhistoryservice-2.7.2.jar.sha1 | 1 +
.../hadoop-yarn-server-common-2.6.0.jar.sha1 | 1 -
.../hadoop-yarn-server-common-2.7.2.jar.sha1 | 1 +
...adoop-yarn-server-nodemanager-2.6.0.jar.sha1 | 1 -
...adoop-yarn-server-nodemanager-2.7.2.jar.sha1 | 1 +
...p-yarn-server-resourcemanager-2.6.0.jar.sha1 | 1 -
...p-yarn-server-resourcemanager-2.7.2.jar.sha1 | 1 +
...adoop-yarn-server-tests-2.6.0-tests.jar.sha1 | 1 -
...adoop-yarn-server-tests-2.7.2-tests.jar.sha1 | 1 +
.../hadoop-yarn-server-web-proxy-2.6.0.jar.sha1 | 1 -
.../hadoop-yarn-server-web-proxy-2.7.2.jar.sha1 | 1 +
solr/licenses/htrace-core-3.0.4.jar.sha1 | 1 -
.../htrace-core-3.2.0-incubating.jar.sha1 | 1 +
solr/licenses/netty-3.7.0.Final.jar.sha1 | 1 -
solr/licenses/netty-LICENSE-ASL.txt | 202 --------
solr/licenses/netty-NOTICE.txt | 121 -----
solr/licenses/netty-all-4.0.36.Final.jar.sha1 | 1 +
solr/licenses/netty-all-LICENSE-ASL.txt | 202 ++++++++
solr/licenses/netty-all-NOTICE.txt | 121 +++++
112 files changed, 3150 insertions(+), 723 deletions(-)
----------------------------------------------------------------------