You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/15 18:44:54 UTC

[21/30] storm git commit: upmerge from master

upmerge from master


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/90025285
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/90025285
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/90025285

Branch: refs/heads/master
Commit: 9002528531693d793299458fd6f01b3e83ca1528
Parents: 39ea23c
Author: 卫乐 <we...@taobao.com>
Authored: Sat Mar 5 20:03:01 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Sat Mar 5 20:03:01 2016 +0800

----------------------------------------------------------------------
 storm-core/test/clj/org/apache/storm/nimbus_test.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/90025285/storm-core/test/clj/org/apache/storm/nimbus_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/nimbus_test.clj b/storm-core/test/clj/org/apache/storm/nimbus_test.clj
index 53a3678..904d0db 100644
--- a/storm-core/test/clj/org/apache/storm/nimbus_test.clj
+++ b/storm-core/test/clj/org/apache/storm/nimbus_test.clj
@@ -22,7 +22,7 @@
             TestAggregatesCounter TestPlannerSpout TestPlannerBolt]
            [org.apache.storm.nimbus InMemoryTopologyActionNotifier]
            [org.apache.storm.generated GlobalStreamId]
-           [org.apache.storm ThriftMockAutoCred]
+           [org.apache.storm Thrift MockAutoCred]
            [org.apache.storm.stats BoltExecutorStats])
   (:import [org.apache.storm.testing.staticmocking MockedZookeeper])
   (:import [org.apache.storm.scheduler INimbus])