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 0729D200B4D for ; Sat, 18 Jun 2016 00:01:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 043A1160A63; Fri, 17 Jun 2016 22:01:42 +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 34F18160A65 for ; Sat, 18 Jun 2016 00:01:41 +0200 (CEST) Received: (qmail 81484 invoked by uid 500); 17 Jun 2016 22:01:40 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 81315 invoked by uid 99); 17 Jun 2016 22:01:40 -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; Fri, 17 Jun 2016 22:01:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 20E5EEADA0; Fri, 17 Jun 2016 22:01:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Fri, 17 Jun 2016 22:01:46 -0000 Message-Id: In-Reply-To: <79eee92cfd6b416a98312a467ca68a1b@git.apache.org> References: <79eee92cfd6b416a98312a467ca68a1b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/10] accumulo git commit: Merge branch '1.6' into 1.7 archived-at: Fri, 17 Jun 2016 22:01:42 -0000 Merge branch '1.6' into 1.7 Conflicts: LICENSE Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b920536 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b920536 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b920536 Branch: refs/heads/master Commit: 7b920536539a8c2d91cea55c04e996dddf6f63e0 Parents: 3aecf0a d5ea00f Author: Sean Busbey Authored: Fri Jun 17 16:17:58 2016 -0500 Committer: Sean Busbey Committed: Fri Jun 17 16:17:58 2016 -0500 ---------------------------------------------------------------------- LICENSE | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b920536/LICENSE ---------------------------------------------------------------------- diff --cc LICENSE index 06bf42d,7082472..b9dea50 --- a/LICENSE +++ b/LICENSE @@@ -220,7 -248,28 +248,29 @@@ This product bundles JQuery and Flot, w The MIT License (MIT). For details, see server/monitor/src/main/resources/web/flot/ +----- + Text of the MIT License: + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. This product bundles Flot,