You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2016/09/30 21:05:53 UTC
[06/12] incubator-trafodion git commit: Merge remote branch
'sbroeder_inctraf/sean_traf' into sean_traf
Merge remote branch 'sbroeder_inctraf/sean_traf' into sean_traf
Conflicts:
core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a62e76fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a62e76fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a62e76fa
Branch: refs/heads/master
Commit: a62e76faf1753a02dd9095aa1061829b537da49f
Parents: 98a1ec6 b352dd8
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Thu Sep 29 15:14:38 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Thu Sep 29 15:14:38 2016 +0000
----------------------------------------------------------------------
.../client/transactional/TransactionManager.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------