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/fbd7249f Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fbd7249f Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fbd7249f Branch: refs/heads/develop Commit: fbd7249f35034d8ff40f0635b8931183def371d1 Parents: 1da0c8d aea7497 Author: Jon Maron <[email protected]> Authored: Mon Nov 10 21:39:32 2014 -0500 Committer: Jon Maron <[email protected]> Committed: Mon Nov 10 21:39:32 2014 -0500 ---------------------------------------------------------------------- app-packages/storm/appConfig-secured-default.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
