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

[bobby]

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