trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [3/4] incubator-trafodion git commit: Merge remote branch 'origin/master' into ansharma_aligned_br
Date Wed, 28 Sep 2016 00:39:10 GMT
Merge remote branch 'origin/master' into ansharma_aligned_br

Conflicts:
	core/sql/regress/hive/EXPECTED018


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

Branch: refs/heads/master
Commit: 953a4117566d29dc188f1ab99468cf061d0d65cf
Parents: 0386a66 af63cce
Author: Anoop Sharma <anoop.sharma@esgyn.com>
Authored: Wed Sep 28 00:36:28 2016 +0000
Committer: Anoop Sharma <anoop.sharma@esgyn.com>
Committed: Wed Sep 28 00:36:28 2016 +0000

----------------------------------------------------------------------
 core/sqf/sql/scripts/sqcheck                    |  27 ++++-
 .../org/trafodion/dcs/server/ServerManager.java | 115 ++++++++++++-------
 2 files changed, 99 insertions(+), 43 deletions(-)
----------------------------------------------------------------------



Mime
View raw message