You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/23 15:58:38 UTC
[2/2] incubator-trafodion git commit: Merge remote branch
'origin/pr/142/head' into mrg_70
Merge remote branch 'origin/pr/142/head' into mrg_70
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a2668078
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a2668078
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a2668078
Branch: refs/heads/master
Commit: a2668078ad5102ce7624464e73f95a1e4746ef72
Parents: b8e46bd e84ea2f
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Oct 23 13:58:14 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Oct 23 13:58:14 2015 +0000
----------------------------------------------------------------------
dcs/src/main/java/org/trafodion/dcs/master/DcsMaster.java | 7 ++++++-
dcs/src/main/java/org/trafodion/dcs/servermt/DcsServer.java | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------