You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/22 05:31:54 UTC

[2/2] incubator-trafodion git commit: Merge Fix for [TRAFODION-2228]fix shift/reduce conflict for AES_ENCRYPT/AES_DECRYPT

Merge Fix for [TRAFODION-2228]fix shift/reduce conflict for AES_ENCRYPT/AES_DECRYPT


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

Branch: refs/heads/master
Commit: c69b501af3a6811aadcba2a54e74262e71fd0115
Parents: 763f15b 37fa8dc
Author: Liu Ming <ov...@sina.com>
Authored: Thu Dec 22 05:31:20 2016 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Thu Dec 22 05:31:20 2016 +0000

----------------------------------------------------------------------
 core/sql/parser/sqlparser.y | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------