[12/12] git commit: Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry

2014-09-30 Thread stevel
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry Conflicts: slider-core/src/main/java/org/apache/slider/client/SliderClient.java Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit:

[12/12] git commit: Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry

2014-08-28 Thread stevel
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c692461b Tree: