You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/18 16:22:05 UTC
[03/11] incubator-trafodion git commit: Merge branch 'release2.0' of
github.com:apache/incubator-trafodion into TRAFODION-1985
Merge branch 'release2.0' of github.com:apache/incubator-trafodion into TRAFODION-1985
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/19b8d1f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/19b8d1f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/19b8d1f5
Branch: refs/heads/release2.0
Commit: 19b8d1f513622fd970efb6edcbe93da833599f7b
Parents: 42b407c 8feea90
Author: Amanda Moran <am...@apache.com>
Authored: Thu May 12 16:56:05 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Thu May 12 16:56:05 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/rest/Makefile | 16 +-
core/rest/pom.xml | 34 +-
core/rest/src/assembly/all.xml | 10 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
.../java/org/trafodion/libmgmt/FileMgmt.java | 1 +
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 -------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 --------------
licenses/lic-server-bin | 1834 ++++++++++++++++++
licenses/lic-server-src | 69 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
22 files changed, 1967 insertions(+), 2306 deletions(-)
----------------------------------------------------------------------