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/06/28 20:40:16 UTC

[1/2] incubator-trafodion git commit: Update expected results file for priv1/TEST125

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 48f6db500 -> 20c459cfb


Update expected results file for priv1/TEST125


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

Branch: refs/heads/master
Commit: 1e0355a8e22ce5fb9e2a82ee54cf7ca6a5b60116
Parents: e67e90f
Author: Roberta Marton <rm...@edev07.esgyn.local>
Authored: Tue Jun 27 22:56:30 2017 +0000
Committer: Roberta Marton <rm...@edev07.esgyn.local>
Committed: Tue Jun 27 22:56:30 2017 +0000

----------------------------------------------------------------------
 core/sql/regress/privs1/EXPECTED125 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1e0355a8/core/sql/regress/privs1/EXPECTED125
----------------------------------------------------------------------
diff --git a/core/sql/regress/privs1/EXPECTED125 b/core/sql/regress/privs1/EXPECTED125
index 2128013..67e739e 100644
--- a/core/sql/regress/privs1/EXPECTED125
+++ b/core/sql/regress/privs1/EXPECTED125
@@ -223,9 +223,6 @@
 --- SQL operation complete.
 >>
 >>-- create function to display bitmaps as a bitmap rather than longs
->>-- set envvar REGRRUNDIR '/mnt/rmarton/gitws/incubator-trafodion/core/sql/regress/rundir/privs1';
->>-- set envvar REGRTSTDIR '/mnt/rmarton/gitws/incubator-trafodion/core/sql/regress/privs1';
->>-- set envvar scriptsdir '/mnt/rmarton/gitws/incubator-trafodion/core/sql/regress';
 >>sh rm -f ./etest141.dll;
 >>sh sh $$scriptsdir$$/tools/dll-compile.ksh etest141.cpp
 +>  2>&1 | tee LOG125-SECONDARY;
@@ -242,6 +239,7 @@
 
 --- SQL operation complete.
 >>
+-- create procedure that accesses hive tables
 >>sh sh $$scriptsdir$$/tools/java-compile.ksh Utils.java TestHive.java 2> LOG125-SECONDARY | tee -a LOG125;
 ------------------------------------------------------------------------------
 -- Compiling Java source files: Utils.java TestHive.java


[2/2] incubator-trafodion git commit: Merge remote branch 'origin/pr/1151/head' into merge_1151

Posted by sa...@apache.org.
Merge remote branch 'origin/pr/1151/head' into merge_1151


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

Branch: refs/heads/master
Commit: 20c459cfb4889169b18fda721b525741225693c9
Parents: 48f6db5 1e0355a
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Wed Jun 28 20:39:55 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Wed Jun 28 20:39:55 2017 +0000

----------------------------------------------------------------------
 core/sql/regress/privs1/EXPECTED125 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------