You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/05/19 12:14:41 UTC
[5/6] incubator-slider git commit: Merge branch
'feature/SLIDER-878-jersey' into develop
Merge branch 'feature/SLIDER-878-jersey' into develop
# Conflicts:
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/36169512
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/36169512
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/36169512
Branch: refs/heads/develop
Commit: 3616951225067932d62ad5642f26e395f3792450
Parents: 9682990 f1efe76
Author: Steve Loughran <st...@apache.org>
Authored: Tue May 19 11:13:43 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue May 19 11:13:43 2015 +0100
----------------------------------------------------------------------
.../restclient/SliderURLConnectionFactory.java | 176 +++++++++++++++++++
.../core/restclient/UgiJerseyBinding.java | 3 +-
.../restclient/UrlConnectionOperations.java | 25 +--
3 files changed, 181 insertions(+), 23 deletions(-)
----------------------------------------------------------------------