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/5fad4934 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5fad4934 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5fad4934 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 5fad4934a9bcf1412e5714b5d519f747254b3cf9 Parents: c692461 93e2b52 Author: Steve Loughran <ste...@apache.org> Authored: Thu Aug 28 15:50:44 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Aug 28 15:50:44 2014 +0100 ---------------------------------------------------------------------- .../org/apache/slider/common/SliderKeys.java | 7 + .../server/appmaster/SliderAppMaster.java | 8 +- .../web/SliderAmFilterInitializer.java | 71 ------- .../server/appmaster/web/SliderAmIpFilter.java | 155 -------------- .../appmaster/web/TestSliderAmFilter.java | 200 ------------------- 5 files changed, 9 insertions(+), 432 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5fad4934/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ----------------------------------------------------------------------
