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/1.8
Commit: 7b920536539a8c2d91cea55c04e996dddf6f63e0
Parents: 3aecf0a d5ea00f
Author: Sean Busbey <bus...@cloudera.com>
Authored: Fri Jun 17 16:17:58 2016 -0500
Committer: Sean Busbey <bus...@cloudera.com>
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,
