You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2016/02/16 23:11:24 UTC
[5/5] incubator-trafodion git commit: Merge branch 'master' into
mrg_319
Merge branch 'master' into mrg_319
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/83c66bfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/83c66bfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/83c66bfb
Branch: refs/heads/master
Commit: 83c66bfb10f2158cd365fcb02e1004b4c46369ba
Parents: 85ffa1f 6f26a0a
Author: Roberta Marton <ro...@apache.org>
Authored: Tue Feb 16 22:10:58 2016 +0000
Committer: Roberta Marton <ro...@apache.org>
Committed: Tue Feb 16 22:10:58 2016 +0000
----------------------------------------------------------------------
.../java/org/trafodion/rest/ServerResource.java | 37 +++++---------------
.../org/trafodion/rest/VersionResource.java | 25 +++----------
2 files changed, 13 insertions(+), 49 deletions(-)
----------------------------------------------------------------------