You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/11/02 15:57:37 UTC
[4/4] incubator-trafodion git commit: Merge remote branch
'origin/pr/153/head' into mrg_74
Merge remote branch 'origin/pr/153/head' into mrg_74
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/038c5546
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/038c5546
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/038c5546
Branch: refs/heads/master
Commit: 038c554647dd44b4f653f36676403ef14909ad52
Parents: 2fffe34 04e6d13
Author: Suresh Subbiah <su...@apache.org>
Authored: Mon Nov 2 14:57:09 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Mon Nov 2 14:57:09 2015 +0000
----------------------------------------------------------------------
.rat-excludes | 1 -
DISCLAIMER.txt | 12 +
LICENSE.txt | 271 +++++++++++++++
NOTICE.txt | 2 +-
RAT_README.txt | 158 ++++++---
README.txt | 35 ++
core/sqf/sql/scripts/install_traf_components | 1 +
.../master/datatables/license-gpl2.txt | 339 -------------------
dcs/src/test/pytests/.env.sh.tmpl | 2 +-
dcs/src/test/pytests/.odbc.ini.tmpl | 2 -
install/installer/trafodion_license | 27 +-
readme.md | 5 -
tests/phx/phoenix_test.py | 2 +-
13 files changed, 466 insertions(+), 391 deletions(-)
----------------------------------------------------------------------