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 2014/06/19 02:51:07 UTC
[5/5] git commit: Merge branch
'feature/SLIDER-149_integrate_with_a_YARN_service_registry' into develop
Merge branch 'feature/SLIDER-149_integrate_with_a_YARN_service_registry' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/93475e1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/93475e1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/93475e1b
Branch: refs/heads/develop
Commit: 93475e1bd281d6c65667e07d641819c85e74057e
Parents: 6744e7d 5b90d3e
Author: Steve Loughran <st...@apache.org>
Authored: Wed Jun 18 17:50:38 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Jun 18 17:50:38 2014 -0700
----------------------------------------------------------------------
.../core/registry/info/RegisteredEndpoint.java | 44 +++++++++++++-------
.../core/registry/info/ServiceInstanceData.java | 2 +
.../providers/AbstractProviderService.java | 2 +-
.../server/services/curator/CuratorUriSpec.java | 2 +-
4 files changed, 32 insertions(+), 18 deletions(-)
----------------------------------------------------------------------