resolve conflict when merge with master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/95bf6734 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/95bf6734 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/95bf6734 Branch: refs/heads/master Commit: 95bf67347cad7c11aeaf55b7588e627be298d1c2 Parents: 69c8b3c Author: xiaojian.fxj <[email protected]> Authored: Thu Mar 10 23:49:52 2016 +0800 Committer: xiaojian.fxj <[email protected]> Committed: Thu Mar 10 23:49:52 2016 +0800 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/testing.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/95bf6734/storm-core/src/clj/org/apache/storm/testing.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/org/apache/storm/testing.clj b/storm-core/src/clj/org/apache/storm/testing.clj index 4cec39a..d2d2671 100644 --- a/storm-core/src/clj/org/apache/storm/testing.clj +++ b/storm-core/src/clj/org/apache/storm/testing.clj @@ -296,7 +296,7 @@ [(:nimbus cluster-map)] ; because a worker may already be dead workers)] - (while-timeout timeout-ms (or (not (every? (memfn waiting?) daemons)) + (while-timeout timeout-ms (or (not (every? (memfn isWaiting?) daemons)) (not (every? is-supervisor-waiting supervisors))) (Thread/sleep (rand-int 20)) ;; (doseq [d daemons]
