Repository: tajo Updated Branches: refs/heads/master fbf716689 -> bb482d8ee
TAJO-1001: Add missed postgresql license to NOTICE.txt and LICENSE.txt. Closes #114 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/bb482d8e Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/bb482d8e Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/bb482d8e Branch: refs/heads/master Commit: bb482d8ee3363e0a9db18764af26ea68c0d3fae0 Parents: fbf7166 Author: Hyunsik Choi <[email protected]> Authored: Mon Aug 11 17:14:47 2014 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Wed Aug 13 13:40:04 2014 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ LICENSE | 25 +++++++++++++++++++++++++ NOTICE | 6 ++++++ 3 files changed, 34 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/bb482d8e/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 839125e..f421aca 100644 --- a/CHANGES +++ b/CHANGES @@ -329,6 +329,9 @@ Release 0.9.0 - unreleased TASKS + TAJO-1001: Add missed postgresql license to NOTICE.txt and LICENSE.txt. + (hyunsik) + TAJO-890: Redirect stdout of maven test to /dev/null in Travis CI script. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/bb482d8e/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 31eb031..86975d5 100644 --- a/LICENSE +++ b/LICENSE @@ -315,3 +315,28 @@ 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. + +----------------------------------------------------------------------------- +For PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. http://git-wip-us.apache.org/repos/asf/tajo/blob/bb482d8e/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 9618522..af7995f 100644 --- a/NOTICE +++ b/NOTICE @@ -8,3 +8,9 @@ This product includes Protobuf-java-format (http://code.google.com/p/protobuf-ja Copyright 2000-2011 NeuStar, Inc. All rights reserved. Copyright (c) 2009, Orbitz World Wide All rights reserved. Copyright 2012 Cloudera Inc. + +This product includes PostgreSQL Database Management System. +(formerly known as Postgres, then as Postgres95) +License: PostgreSQL License (http://www.postgresql.org/about/licence/) +Portions Copyright (c) 1996-2014, PostgreSQL Global Development Group +Portions Copyright (c) 1994, The Regents of the University of California
