trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [09/10] incubator-trafodion git commit: [TRAFODION-1977] Merge 2.0.1 RC1 fixes forward to master
Date Thu, 09 Jun 2016 16:01:48 GMT
[TRAFODION-1977] Merge 2.0.1 RC1 fixes forward to master

Merging all release2.0 branch fixes forward. This now includes
TRAFODION-2023 Clarify License Text
TRAFODION-2024 Dynamically link SSL libraries


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4ce086c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4ce086c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4ce086c1

Branch: refs/heads/master
Commit: 4ce086c1be09ca8d6d111a13541cadc71f4da4d2
Parents: 0a4a6a3 355bb68
Author: Steve Varnau <steve.varnau@esgyn.com>
Authored: Wed Jun 8 17:59:52 2016 +0000
Committer: Steve Varnau <steve.varnau@esgyn.com>
Committed: Wed Jun 8 17:59:52 2016 +0000

----------------------------------------------------------------------
 .rat-excludes                                   |   2 +-
 RAT_README                                      |  16 +-
 README                                          |   4 +-
 .../odbc/odbcclient/unixcli/makefile.lnx        |   2 +-
 core/sqf/sqenvcom.sh                            |   1 -
 core/sql/nskgmake/openssl_client/Makefile       |  80 ---
 licenses/lic-clients-bin                        | 136 +----
 licenses/lic-server-bin                         | 560 +------------------
 licenses/lic-server-src                         |   3 +
 9 files changed, 17 insertions(+), 787 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ce086c1/core/conn/unixodbc/odbc/odbcclient/unixcli/makefile.lnx
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4ce086c1/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --cc core/sqf/sqenvcom.sh
index 311bc13,500bd0f..48c516f
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@@ -31,10 -31,9 +31,9 @@@
  
  #Product version (Trafodion or derivative product)
  export TRAFODION_VER_PROD="Apache Trafodion"
- # Trafodion version (also update file ../sql/common/copyright.h)
  export TRAFODION_VER_MAJOR=2
 -export TRAFODION_VER_MINOR=0
 -export TRAFODION_VER_UPDATE=1
 +export TRAFODION_VER_MINOR=1
 +export TRAFODION_VER_UPDATE=0
  export TRAFODION_VER="${TRAFODION_VER_MAJOR}.${TRAFODION_VER_MINOR}.${TRAFODION_VER_UPDATE}"
  
  # Product copyright header


Mime
View raw message