Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/41599dc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/41599dc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/41599dc1 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 41599dc14cd259e755bc01c0d9febc6bb4d8fe71 Parents: 3736b3a 6afa8f9 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Sat Aug 23 19:55:57 2014 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Sat Aug 23 19:55:57 2014 -0700 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider | 3 ++- slider-assembly/src/main/scripts/slider.py | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
