You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/16 20:49:57 UTC
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1991] PR 478
Change how commit conflicts are reported
Merge [TRAFODION-1991] PR 478 Change how commit conflicts are reported
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8c87a9a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8c87a9a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8c87a9a5
Branch: refs/heads/master
Commit: 8c87a9a5fafaa8ff52550921615a444de2edd69f
Parents: 8110b8d 9715668
Author: Dave Birdsall <db...@apache.org>
Authored: Mon May 16 20:49:03 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon May 16 20:49:03 2016 +0000
----------------------------------------------------------------------
core/sqf/src/tm/tmlib.cpp | 5 +++--
core/sqf/src/tm/tmtx.cpp | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------