You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bu...@apache.org on 2016/06/17 22:01:40 UTC
[01/10] accumulo git commit: ACCUMULO-4346 correct LICENSE file for
source to include text of referenced third party licenses.
Repository: accumulo
Updated Branches:
refs/heads/1.6 f99ac9b31 -> d5ea00fcd
refs/heads/1.7 3aecf0ac8 -> 7b9205365
refs/heads/1.8 e81185117 -> 519e5b790
refs/heads/master 04579f610 -> 371a95c22
ACCUMULO-4346 correct LICENSE file for source to include text of referenced third party licenses.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5ea00fc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5ea00fc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5ea00fc
Branch: refs/heads/1.6
Commit: d5ea00fcd5b3ec574181d4dea70088653943c9fe
Parents: f99ac9b
Author: Sean Busbey <bu...@cloudera.com>
Authored: Fri Jun 17 15:03:51 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Fri Jun 17 15:03:51 2016 -0500
----------------------------------------------------------------------
LICENSE | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5ea00fc/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4f61cf2..7082472 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,19 +207,70 @@ APACHE ACCUMULO SUBCOMPONENTS:
The Apache Accumulo project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
-licenses.
+licenses.
This product bundles softare from the European Commission project OneLab
under contract 034819 (http://www.one-lab.org), which is available under
a "3-clause BSD" license. For details, see
core/src/main/java/org/apache/accumulo/core/bloomfilter/
-----
+ Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org)
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+ - Neither the name of the University Catholique de Louvain - UCL
+ nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+----
This product bundles JQuery and Flot, which are each available under
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,
Copyright (c) 2007-2009 IOLA and Ole Laursen
[06/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by bu...@apache.org.
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.7
Commit: 7b920536539a8c2d91cea55c04e996dddf6f63e0
Parents: 3aecf0a d5ea00f
Author: Sean Busbey <bu...@cloudera.com>
Authored: Fri Jun 17 16:17:58 2016 -0500
Committer: Sean Busbey <bu...@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,
[04/10] accumulo git commit: ACCUMULO-4346 correct LICENSE file for
source to include text of referenced third party licenses.
Posted by bu...@apache.org.
ACCUMULO-4346 correct LICENSE file for source to include text of referenced third party licenses.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5ea00fc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5ea00fc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5ea00fc
Branch: refs/heads/master
Commit: d5ea00fcd5b3ec574181d4dea70088653943c9fe
Parents: f99ac9b
Author: Sean Busbey <bu...@cloudera.com>
Authored: Fri Jun 17 15:03:51 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Fri Jun 17 15:03:51 2016 -0500
----------------------------------------------------------------------
LICENSE | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5ea00fc/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4f61cf2..7082472 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,19 +207,70 @@ APACHE ACCUMULO SUBCOMPONENTS:
The Apache Accumulo project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
-licenses.
+licenses.
This product bundles softare from the European Commission project OneLab
under contract 034819 (http://www.one-lab.org), which is available under
a "3-clause BSD" license. For details, see
core/src/main/java/org/apache/accumulo/core/bloomfilter/
-----
+ Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org)
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+ - Neither the name of the University Catholique de Louvain - UCL
+ nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+----
This product bundles JQuery and Flot, which are each available under
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,
Copyright (c) 2007-2009 IOLA and Ole Laursen
[02/10] accumulo git commit: ACCUMULO-4346 correct LICENSE file for
source to include text of referenced third party licenses.
Posted by bu...@apache.org.
ACCUMULO-4346 correct LICENSE file for source to include text of referenced third party licenses.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5ea00fc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5ea00fc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5ea00fc
Branch: refs/heads/1.7
Commit: d5ea00fcd5b3ec574181d4dea70088653943c9fe
Parents: f99ac9b
Author: Sean Busbey <bu...@cloudera.com>
Authored: Fri Jun 17 15:03:51 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Fri Jun 17 15:03:51 2016 -0500
----------------------------------------------------------------------
LICENSE | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5ea00fc/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4f61cf2..7082472 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,19 +207,70 @@ APACHE ACCUMULO SUBCOMPONENTS:
The Apache Accumulo project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
-licenses.
+licenses.
This product bundles softare from the European Commission project OneLab
under contract 034819 (http://www.one-lab.org), which is available under
a "3-clause BSD" license. For details, see
core/src/main/java/org/apache/accumulo/core/bloomfilter/
-----
+ Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org)
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+ - Neither the name of the University Catholique de Louvain - UCL
+ nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+----
This product bundles JQuery and Flot, which are each available under
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,
Copyright (c) 2007-2009 IOLA and Ole Laursen
[09/10] accumulo git commit: Merge branch '1.7' into 1.8
Posted by bu...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/519e5b79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/519e5b79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/519e5b79
Branch: refs/heads/master
Commit: 519e5b790ad091c0c15afd3d7b8a5ed92098947b
Parents: e811851 7b92053
Author: Sean Busbey <bu...@cloudera.com>
Authored: Fri Jun 17 17:00:49 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Fri Jun 17 17:00:49 2016 -0500
----------------------------------------------------------------------
LICENSE | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[10/10] accumulo git commit: Merge branch '1.8'
Posted by bu...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/371a95c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/371a95c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/371a95c2
Branch: refs/heads/master
Commit: 371a95c225025706612e8247da9dda08bbd03e24
Parents: 04579f6 519e5b7
Author: Sean Busbey <bu...@cloudera.com>
Authored: Fri Jun 17 17:00:57 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Fri Jun 17 17:00:57 2016 -0500
----------------------------------------------------------------------
LICENSE | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[03/10] accumulo git commit: ACCUMULO-4346 correct LICENSE file for
source to include text of referenced third party licenses.
Posted by bu...@apache.org.
ACCUMULO-4346 correct LICENSE file for source to include text of referenced third party licenses.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5ea00fc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5ea00fc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5ea00fc
Branch: refs/heads/1.8
Commit: d5ea00fcd5b3ec574181d4dea70088653943c9fe
Parents: f99ac9b
Author: Sean Busbey <bu...@cloudera.com>
Authored: Fri Jun 17 15:03:51 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Fri Jun 17 15:03:51 2016 -0500
----------------------------------------------------------------------
LICENSE | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5ea00fc/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4f61cf2..7082472 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,19 +207,70 @@ APACHE ACCUMULO SUBCOMPONENTS:
The Apache Accumulo project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
-licenses.
+licenses.
This product bundles softare from the European Commission project OneLab
under contract 034819 (http://www.one-lab.org), which is available under
a "3-clause BSD" license. For details, see
core/src/main/java/org/apache/accumulo/core/bloomfilter/
-----
+ Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org)
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+ - Neither the name of the University Catholique de Louvain - UCL
+ nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+----
This product bundles JQuery and Flot, which are each available under
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,
Copyright (c) 2007-2009 IOLA and Ole Laursen
[05/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by bu...@apache.org.
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 <bu...@cloudera.com>
Authored: Fri Jun 17 16:17:58 2016 -0500
Committer: Sean Busbey <bu...@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,
[08/10] accumulo git commit: Merge branch '1.7' into 1.8
Posted by bu...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/519e5b79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/519e5b79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/519e5b79
Branch: refs/heads/1.8
Commit: 519e5b790ad091c0c15afd3d7b8a5ed92098947b
Parents: e811851 7b92053
Author: Sean Busbey <bu...@cloudera.com>
Authored: Fri Jun 17 17:00:49 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Fri Jun 17 17:00:49 2016 -0500
----------------------------------------------------------------------
LICENSE | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[07/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by bu...@apache.org.
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 <bu...@cloudera.com>
Authored: Fri Jun 17 16:17:58 2016 -0500
Committer: Sean Busbey <bu...@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,