Repository: trafodion Updated Branches: refs/heads/master 995e8a090 -> 6ca1d0f14
Merge remote branch 'origin/master' into ansharma_trafixes_deliver2_br Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/2167123e Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/2167123e Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/2167123e Branch: refs/heads/master Commit: 2167123e6aebdca754bcf49a2523a958b7823c73 Parents: 43984c4 3edf1f6 Author: Anoop Sharma <[email protected]> Authored: Thu Apr 5 20:30:40 2018 +0000 Committer: Anoop Sharma <[email protected]> Committed: Thu Apr 5 20:30:40 2018 +0000 ---------------------------------------------------------------------- core/sql/common/ComResWords.cpp | 2 -- core/sql/parser/sqlparser.y | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/2167123e/core/sql/parser/sqlparser.y ----------------------------------------------------------------------
