Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 4dda1198c -> f918a261e


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


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

Branch: refs/heads/master
Commit: 0846d41a47f772e95b365281ff97bd5bdd820429
Parents: cb4367b 10e61eb
Author: Amanda Moran <[email protected]>
Authored: Wed Mar 23 22:12:36 2016 +0000
Committer: Amanda Moran <[email protected]>
Committed: Wed Mar 23 22:12:36 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |    2 +-
 core/sql/comexe/ComTdbHbaseAccess.h             |   27 +-
 core/sql/executor/ExHbaseSelect.cpp             |   19 +-
 core/sql/generator/Generator.cpp                |    8 +-
 core/sql/parser/ElemDDLCol.cpp                  |  542 ++--
 core/sql/parser/ElemDDLColDef.h                 |   14 +-
 core/sql/parser/StmtDDLCreate.cpp               |    7 +-
 core/sql/parser/sqlparser.y                     |   17 +-
 core/sql/regress/seabase/EXPECTED010            |    2 +-
 core/sql/regress/seabase/EXPECTED027            |  157 +-
 core/sql/regress/seabase/TEST010                |    2 +-
 core/sql/regress/seabase/TEST027                |   16 +
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |    6 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |    1 -
 .../src/asciidoc/_chapters/SQuirrel.adoc        |    8 +-
 .../src/asciidoc/_chapters/about.adoc           |   11 +-
 .../src/asciidoc/_chapters/dbviz.adoc           |   17 +-
 .../src/asciidoc/_chapters/introduction.adoc    |  130 +-
 .../src/asciidoc/_chapters/jdbct4.adoc          |  353 ++-
 .../src/asciidoc/_chapters/odb.adoc             |   49 +-
 .../src/asciidoc/_chapters/odbc_linux.adoc      |   82 +-
 .../src/asciidoc/_chapters/odbc_windows.adoc    |  176 +-
 .../src/asciidoc/_chapters/sample_prog.adoc     |    6 +-
 .../src/asciidoc/_chapters/trafci.adoc          |  323 ++-
 docs/client_install/src/asciidoc/index.adoc     |   11 +-
 .../src/images/win10_edit_path.jpg              |  Bin 0 -> 65094 bytes
 .../src/images/win10_select_java.jpg            |  Bin 0 -> 22758 bytes
 .../src/asciidoc/_chapters/about.adoc           |    4 +-
 .../src/asciidoc/_chapters/commands.adoc        |    8 +-
 .../src/asciidoc/_chapters/install.adoc         |   70 +-
 .../src/asciidoc/_chapters/interactive.adoc     |   56 +-
 .../src/asciidoc/_chapters/introduction.adoc    |   10 +-
 .../src/asciidoc/_chapters/launch.adoc          |  148 +-
 .../src/asciidoc/_chapters/perlpython.adoc      |   72 +-
 .../src/asciidoc/_chapters/scripts.adoc         |   24 +-
 docs/command_interface/src/asciidoc/index.adoc  |    4 +
 .../src/resources/source/sample.pl              |   19 +
 .../src/resources/source/sample.py              |   29 +
 docs/spj_guide/pom.xml                          |  289 +++
 .../spj_guide/src/asciidoc/_chapters/about.adoc |  200 ++
 .../src/asciidoc/_chapters/create_spjs.adoc     |  508 ++++
 .../src/asciidoc/_chapters/deploy_spjs.adoc     |  557 ++++
 .../src/asciidoc/_chapters/develop_spjs.adoc    |  899 +++++++
 .../src/asciidoc/_chapters/execute_spjs.adoc    |  730 ++++++
 .../src/asciidoc/_chapters/get_started.adoc     |  121 +
 .../asciidoc/_chapters/grant_privileges.adoc    |  312 +++
 .../src/asciidoc/_chapters/introduction.adoc    |  255 ++
 .../_chapters/performance_troubleshooting.adoc  |  416 +++
 .../src/asciidoc/_chapters/sample_database.adoc |  816 ++++++
 .../src/asciidoc/_chapters/sample_spjs.adoc     | 2386 ++++++++++++++++++
 docs/spj_guide/src/asciidoc/index.adoc          |  113 +
 docs/src/site/markdown/documentation.md         |    4 +
 docs/src/site/markdown/download.md              |    2 +-
 pom.xml                                         |    4 +-
 55 files changed, 8955 insertions(+), 1089 deletions(-)
----------------------------------------------------------------------


Reply via email to