Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 487EE200ABF for ; Tue, 3 May 2016 08:08:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 473C21609B3; Tue, 3 May 2016 08:08:36 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8E1A11609A7 for ; Tue, 3 May 2016 08:08:35 +0200 (CEST) Received: (qmail 78879 invoked by uid 500); 3 May 2016 06:08:34 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 78863 invoked by uid 99); 3 May 2016 06:08:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 06:08:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D611DFA44; Tue, 3 May 2016 06:08:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kwright@apache.org To: commits@lucene.apache.org Date: Tue, 03 May 2016 06:08:35 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] lucene-solr:master: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr archived-at: Tue, 03 May 2016 06:08:36 -0000 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/21b87bc7 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/21b87bc7 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/21b87bc7 Branch: refs/heads/master Commit: 21b87bc7c45e7ec592419dc22e0c2740b246e0e3 Parents: 39e8e76 91153b9 Author: Karl Wright Authored: Tue May 3 02:08:10 2016 -0400 Committer: Karl Wright Committed: Tue May 3 02:08:10 2016 -0400 ---------------------------------------------------------------------- .../composite/IntersectsRPTVerifyQuery.java | 11 +- .../spatial/prefix/AbstractPrefixTreeQuery.java | 4 +- solr/CHANGES.txt | 3 + .../cloud/OverseerCollectionMessageHandler.java | 271 ++++++++++++++++++- .../cloud/overseer/ClusterStateMutator.java | 46 ++-- .../org/apache/solr/handler/IndexFetcher.java | 23 +- .../apache/solr/handler/ReplicationHandler.java | 7 +- .../org/apache/solr/handler/RestoreCore.java | 6 +- .../org/apache/solr/handler/SnapShooter.java | 92 +++++-- .../solr/handler/admin/CollectionsHandler.java | 51 ++++ .../solr/handler/admin/CoreAdminOperation.java | 98 +++++-- .../solr/cloud/TestCloudBackupRestore.java | 218 +++++++++++++++ .../apache/solr/handler/TestRestoreCore.java | 40 +-- .../solrj/request/CollectionAdminRequest.java | 134 +++++++++ .../apache/solr/common/cloud/ClusterState.java | 20 +- .../org/apache/solr/common/cloud/Slice.java | 32 ++- .../apache/solr/common/cloud/ZkStateReader.java | 5 +- .../solr/common/params/CollectionParams.java | 4 +- .../solr/common/params/CoreAdminParams.java | 5 +- .../org/apache/solr/common/util/StrUtils.java | 7 +- .../solr/cloud/AbstractDistribZkTestBase.java | 22 +- .../cloud/AbstractFullDistribZkTestBase.java | 2 +- 22 files changed, 941 insertions(+), 160 deletions(-) ----------------------------------------------------------------------