[6/8] incubator-trafodion git commit: Merge remote branch 'origin/master' into ansharma_simcheck_br

2016-10-07 Thread ansharma
Merge remote branch 'origin/master' into ansharma_simcheck_br Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a164c4b7 Tree:

[6/8] incubator-trafodion git commit: Merge remote branch 'origin/master'

2016-05-31 Thread sandhya
Merge remote branch 'origin/master' Conflicts: core/sql/regress/executor/EXPECTED130 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/db3ebf5d Tree: