Merge branch 'develop' into feature/SLIDER-481_allow_dedicated_handling_of_exports
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1ef6a88f Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1ef6a88f Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1ef6a88f Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports Commit: 1ef6a88f2867e54eb574ef76a0b92c79b10be3e8 Parents: 11d7e11 0769354 Author: Sumit Mohanty <[email protected]> Authored: Mon Oct 13 13:46:23 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Oct 13 13:46:23 2014 -0700 ---------------------------------------------------------------------- .../memcached-win/package/scripts/memcached.py | 1 - .../memcached/package/scripts/memcached.py | 1 - .../storm-win/package/scripts/service.py | 1 - app-packages/storm/package/scripts/service.py | 9 ++----- .../core/providers/system.py | 28 +++++++++++--------- .../TestDirectoryResource.py | 8 +++--- .../resource_management/TestFileResource.py | 10 +++---- 7 files changed, 26 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
