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

2014-10-11 Thread smohanty
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry Conflicts: slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit:

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

2014-08-27 Thread stevel
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry Conflicts: slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java slider-core/src/main/java/org/apache/slider/providers/ProviderService.java