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/b0eac88e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b0eac88e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b0eac88e Branch: refs/heads/develop Commit: b0eac88e009cf40339aed853c3a007ad5e75fbe5 Parents: f67b550 3511026 Author: Steve Loughran <ste...@apache.org> Authored: Mon Sep 15 10:28:05 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Sep 15 10:28:05 2014 +0100 ---------------------------------------------------------------------- app-packages/storm/metainfo.xml | 2 +- .../appmaster/model/mock/MockContainerId.groovy | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
