You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/05/12 07:52:11 UTC
[44/50] [abbrv] incubator-trafodion git commit: Merge remote branch
'origin/release2.1'
Merge remote branch 'origin/release2.1'
Conflicts:
core/conn/jdbcT4/pom.xml
docs/sql_reference/src/asciidoc/_chapters/olap_functions.adoc
docs/sql_reference/src/asciidoc/_chapters/sql_functions_and_expressions.adoc
install/python-installer/db_uninstall.py
install/python-installer/scripts/copy_files.py
install/python-installer/scripts/hdfs_cmds.py
install/python-installer/scripts/traf_check.py
install/python-installer/scripts/traf_ldap.py
install/python-installer/scripts/traf_setup.py
install/python-installer/scripts/traf_user.py
install/python-installer/scripts/wrapper.py
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b389ce50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b389ce50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b389ce50
Branch: refs/heads/master
Commit: b389ce506b3d535ce3c30cdf5282172f6b9515da
Parents: d839aea dc3d97f
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon May 8 20:16:48 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon May 8 20:16:48 2017 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
core/conn/jdbcT4/pom.xml | 93 +++++++++++++++++++
core/sqf/build-scripts/build.branch | 4 +-
core/sqf/sqenvcom.sh | 34 +++----
core/sqf/src/seabed/src/ms.cpp | 2 +
core/sql/cli/CliExtern.cpp | 23 ++++-
.../src/asciidoc/_chapters/ambari_install.adoc | 51 +++++++---
docs/provisioning_guide/src/images/amb1.PNG | Bin 0 -> 46318 bytes
docs/provisioning_guide/src/images/amb2.PNG | Bin 0 -> 12063 bytes
docs/provisioning_guide/src/images/amb3.PNG | Bin 0 -> 13764 bytes
docs/provisioning_guide/src/images/amb4.PNG | Bin 0 -> 44413 bytes
docs/provisioning_guide/src/images/amb5.PNG | Bin 0 -> 10552 bytes
.../src/asciidoc/_chapters/olap_functions.adoc | 2 +-
.../sql_functions_and_expressions.adoc | 4 +-
install/ambari-installer/Makefile | 11 ++-
.../2.1/configuration/traf-cluster-env.xml | 1 +
.../2.1/configuration/trafodion-env.xml | 4 +
.../TRAFODION/2.1/package/scripts/params.py | 2 +
.../2.1/package/scripts/trafodionmaster.py | 3 +-
install/python-installer/scripts/copy_files.py | 2 +-
install/python-installer/scripts/traf_check.py | 5 +
21 files changed, 194 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b389ce50/core/conn/jdbcT4/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b389ce50/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b389ce50/docs/sql_reference/src/asciidoc/_chapters/olap_functions.adoc
----------------------------------------------------------------------
diff --cc docs/sql_reference/src/asciidoc/_chapters/olap_functions.adoc
index a2b83ca,26b5647..91ff943
--- a/docs/sql_reference/src/asciidoc/_chapters/olap_functions.adoc
+++ b/docs/sql_reference/src/asciidoc/_chapters/olap_functions.adoc
@@@ -483,7 -483,7 +483,7 @@@ FROM persnl.employee
[[first_value_window_function]]
== FIRST_VALUE Window Function
- The FIRST_VALUE window function returns the first value from a sorted partition.
-The FIRST_VLAUE window function returns the first value from a sorted partition.
++The FIRST_VALUE window function returns the first value from a sorted partition.
`FIRST_VALUE (expression)`