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/7d772088 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7d772088 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7d772088 Branch: refs/heads/develop Commit: 7d7720881e2a680b4f9e137521497c5ba1e8c7eb Parents: d511022 f50adbd Author: tedyu <[email protected]> Authored: Thu Nov 13 16:19:00 2014 -0800 Committer: tedyu <[email protected]> Committed: Thu Nov 13 16:19:00 2014 -0800 ---------------------------------------------------------------------- .../slider/agent/standalone/TestStandaloneAMRestart.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
