You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by hz...@apache.org on 2016/03/01 23:35:57 UTC

[11/37] incubator-trafodion git commit: Merge branch 'master' of https://github.com/apache/incubator-trafodion into a_spj

Merge branch 'master' of https://github.com/apache/incubator-trafodion into a_spj


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

Branch: refs/heads/master
Commit: 4444ac025f3d0ca2179097b6852d671f7bfc6451
Parents: d05a67b 5746be3
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Wed Dec 23 14:00:25 2015 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Wed Dec 23 14:00:25 2015 +0800

----------------------------------------------------------------------
 .gitattributes                                  |   14 +
 .rat-excludes                                   |  117 +-
 LICENSE.txt                                     |  178 +-
 NOTICE.txt                                      |    1 +
 RAT_README.txt                                  |  103 +-
 README.txt                                      |   33 +-
 core/Makefile                                   |    4 +-
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |    3 -
 core/conn/security_dll/LICENSE                  |  127 -
 core/conn/trafci/.gitignore                     |    1 +
 core/conn/trafci/build.xml                      |    9 +-
 .../src/org/trafodion/ci/DatabaseQuery.java     |    4 +-
 .../trafciDefaultLookAndFeel.properties         |    1 +
 core/conn/trafci/utils/trafci.sh                |  185 -
 core/conn/trafci/utils/trafci.sh-tmpl           |  187 +
 .../odbc/odbcclient/unixcli/package/mklnxpkg.sh |    2 -
 .../unixcli/package/trafodbclnx_install.sh      |    2 +-
 core/sqf/build-scripts/genverhdr.ksh            |    3 +-
 core/sqf/conf/log4j.dtm.config                  |   22 -
 core/sqf/conf/log4j.hdfs.config                 |   22 -
 core/sqf/conf/trafodion.udr.config              |   22 -
 core/sqf/export/lib/Vili/Functions.pm           |  725 ---
 core/sqf/export/lib/Vili/Helper.pm              |  674 --
 core/sqf/export/lib/Vili/NoDriftTimer.pm        |   98 -
 core/sqf/sqenvcom.sh                            |    2 +-
 core/sqf/sql/scripts/cleanat                    |   39 +
 core/sqf/sql/scripts/cleanlogs                  |   92 +
 core/sqf/sql/scripts/dcscheck                   |   67 +-
 core/sqf/sql/scripts/dcsstop                    |    4 +
 core/sqf/sql/scripts/findPort.py                |    1 +
 core/sqf/sql/scripts/gensq.pl                   |   20 +-
 core/sqf/sql/scripts/install_local_drill        |  114 +
 core/sqf/sql/scripts/install_local_hadoop       |   90 +-
 core/sqf/sql/scripts/lobstart                   |    4 +-
 core/sqf/sql/scripts/makemsg.ksh                |    2 +-
 core/sqf/sql/scripts/sqcheck                    |   52 +-
 core/sqf/sql/scripts/sqnodes.pm                 |   74 +-
 core/sqf/sqvers                                 |   29 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache  |    4 +
 .../client/transactional/BatchException.java    |   21 -
 .../CommitUnsuccessfulException.java            |   19 -
 .../HBaseBackedTransactionLogger.java           |   10 -
 .../client/transactional/JtaXAResource.java     |   10 -
 .../transactional/LocalTransactionLogger.java   |   19 -
 .../transactional/MemoryUsageException.java     |   20 -
 .../OutOfOrderProtocolException.java            |   20 -
 .../hbase/client/transactional/RMInterface.java |   20 -
 .../transactional/SsccTransactionalScanner.java |   20 -
 .../transactional/SsccTransactionalTable.java   |   20 -
 .../SsccUpdateConflictException.java            |   20 -
 .../hbase/client/transactional/TmDDL.java       |   20 -
 .../client/transactional/TransReturnCode.java   |   20 -
 .../hbase/client/transactional/TransState.java  |   20 -
 .../client/transactional/TransactionLogger.java |   19 -
 .../transactional/TransactionManager.java       |  333 +-
 .../client/transactional/TransactionMap.java    |   22 +-
 .../TransactionRegionLocation.java              |   20 -
 .../client/transactional/TransactionState.java  |   20 -
 .../TransactionalAggregationClient.java         |   19 -
 .../transactional/TransactionalScanner.java     |   20 -
 .../transactional/TransactionalTable.java       |   20 -
 .../transactional/TransactionalTableClient.java |   20 -
 .../UnknownTransactionException.java            |   19 -
 .../transactional/UnsuccessfulDDLException.java |   20 -
 .../transactional/SsccRegionEndpoint.java       |   21 -
 .../transactional/SsccTableClient.java          |   21 -
 .../transactional/SsccTableClientUtils.java     |   18 -
 .../transactional/TrxRegionEndpoint.java        |  386 +-
 .../transactional/TrxRegionObserver.java        |   22 -
 .../transactional/TrxTableClient.java           |   18 -
 .../transactional/TrxTableClient2.java          |   18 -
 .../transactional/TrxTableClient3.java          |   18 -
 .../transactional/TrxTableClient4.java          |   18 -
 .../generated/SsccRegionProtos.java             |  131 +-
 .../generated/TrxRegionProtos.java              | 1020 ++-
 .../CleanOldTransactionsChore.java              |   10 -
 .../hbase/regionserver/transactional/IdTm.java  |   10 -
 .../regionserver/transactional/IdTmCb.java      |   10 -
 .../transactional/IdTmException.java            |   10 -
 .../transactional/KeyValueListScanner.java      |   11 -
 .../transactional/MemoryUsageChore.java         |   10 -
 .../transactional/SsccTransactionState.java     |   21 -
 .../transactional/TransactionState.java         |   21 -
 .../transactional/TransactionalRegion.java      |   10 -
 .../TransactionalRegionScannerHolder.java       |   10 -
 .../transactional/TrxTransactionState.java      |  177 +-
 .../hbase-trx/src/main/protobuf/TrxRegion.proto |   11 +-
 core/sqf/src/tm/tools/dtmci.cpp                 |   34 +-
 core/sqf/tools/sqtools.sh                       |    4 +-
 core/sql/arkcmp/CmpContext.cpp                  |   18 +-
 core/sql/bin/SqlciErrors.txt                    |    5 +-
 core/sql/comexe/ComTdb.h                        |    2 +-
 core/sql/comexe/ComTdbExeUtil.cpp               |   27 +
 core/sql/comexe/ComTdbExeUtil.h                 |  119 +
 core/sql/common/ExprNode.cpp                    |    1 +
 core/sql/common/OperTypeEnum.h                  |   24 +-
 core/sql/common/from_GB2312.c                   |  134 +-
 core/sql/common/swscanf.cpp                     |   55 +-
 core/sql/common/swsprintf.cpp                   |   63 +-
 core/sql/executor/ExComTdb.cpp                  |    7 +
 core/sql/executor/ExExeUtil.h                   |  167 +
 core/sql/executor/ExExeUtilCommon.cpp           |    7 +-
 core/sql/executor/ExExeUtilGet.cpp              |  826 ++-
 core/sql/executor/ExHdfsScan.cpp                |    4 +-
 core/sql/executor/ExStats.cpp                   |   16 +-
 core/sql/executor/ExStats.h                     |    4 +-
 core/sql/executor/HBaseClient_JNI.cpp           |  147 +-
 core/sql/executor/HBaseClient_JNI.h             |    2 +
 core/sql/executor/ex_split_bottom.cpp           |   11 +
 core/sql/exp/ExpHbaseInterface.cpp              |   16 +
 core/sql/exp/ExpHbaseInterface.h                |    3 +
 core/sql/generator/GenExpGenerator.cpp          |    3 +-
 core/sql/generator/GenPreCode.cpp               |    6 +-
 core/sql/generator/GenRelExeUtil.cpp            |  119 +
 core/sql/generator/GenRelScan.cpp               |    2 +-
 core/sql/generator/GenRelUpdate.cpp             |    9 +-
 core/sql/generator/Generator.h                  |    2 +-
 core/sql/optimizer/BindRelExpr.cpp              |    5 +
 core/sql/optimizer/ColStatDesc.h                |    2 +-
 core/sql/optimizer/GroupAttr.cpp                |  179 +
 core/sql/optimizer/GroupAttr.h                  |    4 +
 core/sql/optimizer/ImplRule.cpp                 |   16 +-
 core/sql/optimizer/ItemConstr.h                 |   39 +
 core/sql/optimizer/ItemExpr.cpp                 |   36 +-
 core/sql/optimizer/ItemExpr.h                   |    4 +-
 core/sql/optimizer/NAColumn.h                   |    8 +
 core/sql/optimizer/NATable.cpp                  |   31 +-
 core/sql/optimizer/OptPhysRelExpr.cpp           |    3 +-
 core/sql/optimizer/PhyProp.cpp                  |    2 +-
 core/sql/optimizer/RelExeUtil.cpp               |  128 +-
 core/sql/optimizer/RelExeUtil.h                 |   60 +
 core/sql/optimizer/RelRoutine.cpp               |   55 +-
 core/sql/optimizer/ScanOptimizer.cpp            |  165 +-
 core/sql/optimizer/UdfDllInteraction.cpp        |   10 +-
 core/sql/optimizer/ValueDesc.cpp                |  194 +-
 core/sql/optimizer/ValueDesc.h                  |   14 +-
 core/sql/parser/ParKeyWords.cpp                 |    4 +-
 core/sql/parser/sqlparser.y                     |  112 +-
 core/sql/parser/ulexer.h                        |   39 +-
 core/sql/pom.xml                                |    5 +
 core/sql/regress/catman1/EXPECTED135            |    2 +
 core/sql/regress/catman1/EXPECTED141            |  Bin 0 -> 78469 bytes
 core/sql/regress/catman1/TEST141                |  394 ++
 core/sql/regress/compGeneral/EXPECTED071        |   47 +
 core/sql/regress/compGeneral/TEST062            |    1 +
 core/sql/regress/compGeneral/TEST071            |   22 +
 core/sql/regress/executor/EXPECTED130           |   28 +-
 core/sql/regress/executor/TEST016               |    5 +
 core/sql/regress/executor/TEST130               |    7 +-
 core/sql/regress/hive/EXPECTED005               |    3 +
 core/sql/regress/hive/EXPECTED006               |    3 +
 core/sql/regress/hive/EXPECTED020               |    5 +-
 core/sql/regress/hive/TEST005                   |    1 +
 core/sql/regress/hive/TEST006                   |    1 +
 core/sql/regress/hive/TEST018                   |    1 +
 core/sql/regress/hive/TEST020                   |    1 +
 core/sql/regress/newregr/card/runregr_card.ksh  |    7 -
 .../regress/newregr/mvs/BIG/expectedmv215_RU    |  480 --
 core/sql/regress/newregr/mvs/EXPECTEDMV500      | 4708 --------------
 core/sql/regress/newregr/mvs/EXPECTEDMV500A     | 5179 ----------------
 .../regress/newregr/mvs/EXPECTEDMV500A.LINUX    | 5789 ------------------
 .../sql/regress/newregr/mvs/TPCD/DBGEN_HELP.TXT |   83 -
 core/sql/regress/seabase/EXPECTED002            |  677 ++
 core/sql/regress/seabase/EXPECTED010            |   86 +-
 core/sql/regress/seabase/EXPECTED021            |   26 +-
 core/sql/regress/seabase/FILTER002              |   31 +
 core/sql/regress/seabase/TEST002                |  144 +
 core/sql/regress/seabase/TEST010                |    4 +
 core/sql/regress/seabase/TEST014                |    1 +
 core/sql/regress/seabase/TEST022                |    2 +-
 core/sql/regress/tools/regress-filter           |    5 -
 core/sql/regress/tools/regress-filter-linux     |    5 -
 core/sql/regress/tools/runregr_catman1.ksh      |    2 +-
 core/sql/regress/tools/runregr_udr.ksh          |    7 +
 core/sql/regress/udr/EXPECTED002                |   48 +-
 core/sql/regress/udr/EXPECTED100.SB             |    4 +-
 core/sql/regress/udr/TEST002                    |   18 +
 core/sql/sqlci/SqlCmd.cpp                       |    1 +
 core/sql/sqlcomp/CmpDescribe.cpp                |  198 +-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |    9 +-
 core/sql/sqlcomp/CmpSeabaseDDLauth.cpp          |   15 +
 core/sql/sqlcomp/CmpSeabaseDDLauth.h            |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   19 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |   33 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |  235 +-
 core/sql/sqlcomp/DefaultConstants.h             |   14 +-
 core/sql/sqlcomp/PrivMgr.cpp                    |   57 +
 core/sql/sqlcomp/PrivMgr.h                      |    3 +
 core/sql/sqlcomp/PrivMgrCommands.cpp            |    5 +-
 core/sql/sqlcomp/PrivMgrCommands.h              |    2 +-
 core/sql/sqlcomp/PrivMgrPrivileges.cpp          |   16 +-
 core/sql/sqlcomp/PrivMgrPrivileges.h            |    1 -
 core/sql/sqlcomp/PrivMgrRoles.cpp               |   11 +-
 core/sql/sqlcomp/nadefaults.cpp                 |   10 +-
 core/sql/sqludr/doxygen_tmudr.1.6.config        |    4 +-
 core/sql/sqludr/sqludr.cpp                      |    2 +-
 core/sql/sqludr/sqludr.h                        |   16 +-
 .../java/org/trafodion/sql/HBaseClient.java     |  208 +-
 .../java/org/trafodion/sql/TrafRegionStats.java |  144 +
 .../trafodion/sql/udr/UDRInvocationInfo.java    |   17 +-
 .../org/trafodion/sql/udr/predef/JDBCUDR.java   |  690 +++
 core/sql/ustat/hs_cli.cpp                       |   55 +-
 core/sql/ustat/hs_cli.h                         |    2 +-
 core/sql/ustat/hs_globals.cpp                   |  128 +-
 core/sql/ustat/hs_globals.h                     |    2 -
 core/sql/ustat/hs_la.h                          |    6 +-
 core/sql/ustat/hs_parser.cpp                    |    1 -
 core/updateCopyrightCheck.py                    |    7 +-
 dcs/LICENSE.txt                                 |  202 -
 dcs/NOTICE.txt                                  |    7 -
 dcs/bin/dcs-config.sh                           |   10 +
 dcs/bin/scripts/dcsbind.sh                      |  133 +-
 dcs/bin/scripts/dcsunbind.sh                    |   95 +
 dcs/bin/scripts/parse_dcs_site.py               |   46 +
 dcs/bin/start-dcs.sh                            |   11 +-
 dcs/conf/dcs-env.sh                             |    8 +-
 dcs/conf/master                                 |    0
 .../dcs/master/listener/ConnectReply.java       |   75 +-
 .../org/trafodion/dcs/servermt/ServerUtils.java |   20 +-
 .../servermt/serverHandler/ServerHandler.java   |    2 +
 .../org/trafodion/dcs/util/ByteBufferUtils.java |    2 -
 .../java/org/trafodion/dcs/util/SqlUtils.java   |    2 -
 .../org/trafodion/dcs/version/util/VerGen.java  |   19 -
 .../dcs-webapps/master/css/stylesheet.css       |  191 -
 dcs/src/test/pytests/.tox.ini.tmpl              |   21 -
 docs/.gitignore                                 |    1 +
 .../Trafodion_Client_Installation_Guide.xml     |    6 +-
 docs/client_install/source/xml-profile.xml      |    2 +-
 .../Trafodion_Command_Interface_Guide.xml       |   44 +-
 docs/command_interface/source/xml-profile.xml   |    2 +-
 docs/odb_manual/Trafodion_odb_User_Guide.xml    |    4 +-
 .../source/Trafodion_SQL_Reference_Manual.xml   |   10 +-
 docs/sql_reference/source/xml-profile.xml       |    2 +-
 docs/src/site/asciidoc/index.adoc               |   46 -
 docs/src/site/markdown/advocate.md              |   15 +
 docs/src/site/markdown/architecture-overview.md |  169 +
 docs/src/site/markdown/build-tools-manual.md    |  197 +
 docs/src/site/markdown/build.md                 |   80 +
 docs/src/site/markdown/code-organization.md     |   27 +
 docs/src/site/markdown/code.md                  |   32 +
 docs/src/site/markdown/contribute.md            |   69 +
 .../markdown/cplusplus-coding-guidelines.md     |  310 +
 .../src/site/markdown/create-dev-environment.md |  153 +
 docs/src/site/markdown/develop.md               |  245 +
 docs/src/site/markdown/document.md              |  124 +
 docs/src/site/markdown/documentation.md         |   25 +
 docs/src/site/markdown/download.md              |   36 +
 .../site/markdown/enable-secure-trafodion.md    |  224 +
 docs/src/site/markdown/faq.md                   |  220 +
 docs/src/site/markdown/index.md                 |  133 +
 docs/src/site/markdown/install-preparation.md   |  138 +
 docs/src/site/markdown/install-troubleshoot.md  |   21 +
 docs/src/site/markdown/install.md               |  201 +
 docs/src/site/markdown/ldapcheck.md             |   41 +
 docs/src/site/markdown/ldapconfigcheck.md       |   48 +
 .../src/site/markdown/manage-dev-environment.md |   51 +
 docs/src/site/markdown/management.md            |   62 +
 docs/src/site/markdown/merge.md                 |  140 +
 docs/src/site/markdown/new-features.md          |   15 +
 docs/src/site/markdown/passwordless-ssh.md      |  131 +
 docs/src/site/markdown/performance.md           |   15 +
 docs/src/site/markdown/port-assignment.md       |  134 +
 docs/src/site/markdown/presentations.md         |   18 +
 docs/src/site/markdown/quickstart.md            |   15 +
 docs/src/site/markdown/release-notes-0-8-0.md   |  165 +
 docs/src/site/markdown/release-notes-0-9-0.md   |  210 +
 docs/src/site/markdown/release-notes-1-0-0.md   |  256 +
 docs/src/site/markdown/release-notes-1-0-1.md   |  250 +
 docs/src/site/markdown/release-notes-1-1-0.md   |  181 +
 docs/src/site/markdown/release-notes-1-3-0.md   |  160 +
 docs/src/site/markdown/release-notes.md         |   24 +
 docs/src/site/markdown/release.md               |  225 +
 docs/src/site/markdown/roadmap.md               |   15 +
 .../site/markdown/setup-build-environment.md    |  160 +
 docs/src/site/markdown/testing.md               |  179 +
 docs/src/site/markdown/tests.md                 |   71 +
 .../site/markdown/traf_authentication_config.md |   96 +
 docs/src/site/markdown/uninstall.md             |  176 +
 docs/src/site/markdown/website.md               |  108 +
 docs/src/site/markdown/wiki.md                  |   23 +
 docs/src/site/resources/css/site.css            |  208 +-
 .../resources/images/carousel/processes.png     |  Bin 0 -> 129503 bytes
 .../resources/images/carousel/revolution.png    |  Bin 0 -> 66062 bytes
 .../site/resources/images/carousel/scale.png    |  Bin 0 -> 93783 bytes
 .../site/resources/images/carousel/stack.png    |  Bin 0 -> 102472 bytes
 .../site/resources/images/carousel/timeline.png |  Bin 0 -> 115681 bytes
 .../site/resources/images/logos/community.png   |  Bin 0 -> 6237 bytes
 .../site/resources/images/logos/contribute.png  |  Bin 0 -> 4902 bytes
 .../site/resources/images/logos/understand.png  |  Bin 0 -> 5925 bytes
 docs/src/site/resources/images/logos/use.png    |  Bin 0 -> 2789 bytes
 .../site/resources/images/multi-layer-esps.png  |  Bin 0 -> 116303 bytes
 .../resources/images/process-architecture.png   |  Bin 0 -> 72704 bytes
 docs/src/site/resources/images/revolution.png   |  Bin 0 -> 185535 bytes
 .../presentations/dtm-architecture.pdf          |  Bin 0 -> 225959 bytes
 docs/src/site/site.xml                          |  370 +-
 install/.gitignore                              |    1 +
 install/Makefile                                |    2 -
 install/README.rst                              |   32 -
 install/installer/dcs_installer                 |   53 +-
 install/installer/setup_ssh_key                 |   27 +
 install/installer/traf_add_sudoAccess           |   54 +
 install/installer/traf_add_user                 |   23 +-
 install/installer/traf_config_check             |   14 +
 install/installer/traf_config_setup             |   87 +-
 install/installer/traf_createPasswordLessSSH    |   63 +
 install/installer/traf_getHadoopNodes           |    4 +-
 install/installer/traf_package_setup            |   60 +-
 install/installer/trafodion_config_default      |   11 +
 install/installer/trafodion_install             |    9 +-
 licenses/LICENSE-bsd2                           |   14 +
 licenses/LICENSE-bsd4                           |   31 +
 licenses/LICENSE-facebook                       |   14 +
 licenses/LICENSE-js                             |   18 +
 licenses/LICENSE-salesforce                     |   23 +
 pom.xml                                         |  222 +-
 .../phoenix/end2end/AlterTableTest.java         |   21 -
 .../phoenix/end2end/ArithmeticQueryTest.java    |   21 -
 .../phoenix/end2end/AutoCommitTest.java         |   21 -
 .../org/trafodion/phoenix/end2end/BaseTest.java |   26 +-
 .../trafodion/phoenix/end2end/BatchTest.java    |  250 +
 .../phoenix/end2end/BinaryRowKeyTest.java       |   21 -
 .../phoenix/end2end/CoalesceFunctionTest.java   |   21 -
 .../end2end/CompareDecimalToLongTest.java       |   21 -
 .../phoenix/end2end/CreateTableTest.java        |   21 -
 .../phoenix/end2end/CustomEntityDataTest.java   |   21 -
 .../phoenix/end2end/DeleteRangeTest.java        |   21 -
 .../end2end/DescColumnSortOrderTest.java        |   21 -
 .../phoenix/end2end/DistinctCountTest.java      |   21 -
 .../phoenix/end2end/ExecuteStatementsTest.java  |   21 -
 .../phoenix/end2end/ExtendedQueryExecTest.java  |   21 -
 .../phoenix/end2end/FunkyNamesTest.java         |   21 -
 .../phoenix/end2end/GroupByCaseTest.java        |   21 -
 .../trafodion/phoenix/end2end/IndexTest.java    |   21 -
 .../trafodion/phoenix/end2end/IsNullTest.java   |   21 -
 .../trafodion/phoenix/end2end/KeyOnlyTest.java  |   21 -
 .../phoenix/end2end/MultiCfQueryExecTest.java   |   21 -
 .../trafodion/phoenix/end2end/OrderByTest.java  |   21 -
 .../phoenix/end2end/ProductMetricsTest.java     |   21 -
 .../phoenix/end2end/QueryExecTest.java          |   21 -
 .../end2end/QueryExecWithoutSCNTest.java        |   21 -
 .../phoenix/end2end/QueryPlanTest.java          |   21 -
 .../phoenix/end2end/ReadIsolationLevelTest.java |   21 -
 .../phoenix/end2end/SaltedTableTest.java        |   21 -
 .../end2end/SaltedTableUpsertSelectTest.java    |   21 -
 .../end2end/SaltedTableVarLengthRowKeyTest.java |   21 -
 .../phoenix/end2end/ServerExceptionTest.java    |   21 -
 .../phoenix/end2end/SkipScanQueryTest.java      |   21 -
 .../phoenix/end2end/StatementHintsTest.java     |   21 -
 .../trafodion/phoenix/end2end/StddevTest.java   |   21 -
 .../phoenix/end2end/ToCharFunctionTest.java     |   21 -
 .../phoenix/end2end/ToNumberFunctionTest.java   |   21 -
 .../org/trafodion/phoenix/end2end/TopNTest.java |   21 -
 .../phoenix/end2end/UpsertBigValuesTest.java    |   21 -
 .../end2end/UpsertSelectAutoCommitTest.java     |   21 -
 .../phoenix/end2end/UpsertSelectTest.java       |   21 -
 .../phoenix/end2end/UpsertValuesTest.java       |   21 -
 .../phoenix/end2end/VariableLengthPKTest.java   |   21 -
 win-odbc64/Krypton/KryptonBuild.bat             |   29 +-
 win-odbc64/Krypton/assocsvc.idl                 |   28 +-
 win-odbc64/Krypton/ca.idl                       |   30 +-
 win-odbc64/Krypton/ceecfg.idl                   |   27 +-
 win-odbc64/Krypton/ceercv.idl                   |   29 +-
 win-odbc64/Krypton/clientcfg.idl                |   32 +-
 win-odbc64/Krypton/generated_incs/cee.h         |   28 +-
 win-odbc64/Krypton/generated_incs/ceecfg.h      |   27 +-
 win-odbc64/Krypton/generated_incs/ceercv.h      |   27 +-
 win-odbc64/Krypton/generated_incs/glu.h         |   27 +-
 win-odbc64/Krypton/generated_incs/glu_rs.h      |   27 +-
 win-odbc64/Krypton/generated_incs/glu_stdexc.h  |   27 +-
 win-odbc64/Krypton/generated_incs/idltype.h     |   27 +-
 win-odbc64/Krypton/generated_incs/odbc.h        |   27 +-
 win-odbc64/Krypton/generated_incs/odbcCommon.h  |   27 +-
 win-odbc64/Krypton/generated_incs/odbc_cl.h     |   27 +-
 win-odbc64/Krypton/generated_incs/odbc_sv.h     |   27 +-
 win-odbc64/Krypton/generated_incs/odbcas_cl.h   |   27 +-
 win-odbc64/Krypton/generated_incs/odbcas_sv.h   |   27 +-
 win-odbc64/Krypton/generated_incs/odbccfg.h     |   27 +-
 win-odbc64/Krypton/generated_incs/odbccfg_cl.h  |   27 +-
 win-odbc64/Krypton/generated_incs/odbccfg_sv.h  |   27 +-
 .../Krypton/generated_incs/odbcsrvrcommon.h     |   27 +-
 .../Krypton/generated_incs/tdm_odbcSrvrMsg.h    |   28 +-
 win-odbc64/Krypton/idlcnp.bat                   |   27 +-
 win-odbc64/Krypton/odbc.idl                     |   29 +-
 win-odbc64/Krypton/odbcCommon.idl               |   29 +-
 win-odbc64/Krypton/odbcas.idl                   |   29 +-
 win-odbc64/Krypton/odbccfg.idl                  |   30 +-
 win-odbc64/Krypton/odbcsrvrcommon.idl           |   29 +-
 win-odbc64/Krypton/omxSec.idl                   |   30 +-
 .../odbcclient/DSNConverter/DSNConverter.def    |    2 +-
 .../TranslationDll/TranslationDll.def           |    2 +-
 win-odbc64/odbcclient/drvr35/cconnect.cpp       |    8 +-
 win-odbc64/odbcclient/drvr35/cstmt.cpp          |    6 +-
 win-odbc64/odbcclient/drvr35/drvrnet.h          |    2 +-
 win-odbc64/odbcclient/update_version.pl         |  176 +
 wms/LICENSE.txt                                 |  202 -
 wms/NOTICE.txt                                  |   11 -
 wms/build.xml                                   |    2 +-
 397 files changed, 15582 insertions(+), 23116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4444ac02/core/Makefile
----------------------------------------------------------------------