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 47E63200BB4 for ; Tue, 1 Nov 2016 16:58:52 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 46A3E160ADA; Tue, 1 Nov 2016 15:58:52 +0000 (UTC) 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 BE339160B07 for ; Tue, 1 Nov 2016 16:58:51 +0100 (CET) Received: (qmail 31650 invoked by uid 500); 1 Nov 2016 15:58:50 -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 31415 invoked by uid 99); 1 Nov 2016 15:58:50 -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, 01 Nov 2016 15:58:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88BA4E7DFC; Tue, 1 Nov 2016 15:58:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: krisden@apache.org To: commits@lucene.apache.org Date: Tue, 01 Nov 2016 15:58:54 -0000 Message-Id: <8515f6e97c524a09bc9d318f3413f31c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] lucene-solr:jira/solr-8593: Merge branch 'apache-https-master' into jira/solr-8593 archived-at: Tue, 01 Nov 2016 15:58:52 -0000 Merge branch 'apache-https-master' into jira/solr-8593 Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3856ce4b Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3856ce4b Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3856ce4b Branch: refs/heads/jira/solr-8593 Commit: 3856ce4b5cbedd1c9b6046d7a99206a086ba763a Parents: b2fe7a4 4383bec Author: Kevin Risden Authored: Tue Nov 1 10:58:30 2016 -0500 Committer: Kevin Risden Committed: Tue Nov 1 10:58:30 2016 -0500 ---------------------------------------------------------------------- lucene/CHANGES.txt | 2 +- solr/CHANGES.txt | 11 ++-- .../src/java/org/apache/solr/core/SolrCore.java | 2 +- .../apache/solr/security/BasicAuthPlugin.java | 1 + .../handler/admin/CoreAdminHandlerTest.java | 55 ++++++++++++++++++++ .../solr/security/BasicAuthStandaloneTest.java | 3 +- 6 files changed, 66 insertions(+), 8 deletions(-) ----------------------------------------------------------------------