Github user caofangkun commented on a diff in the pull request:
https://github.com/apache/storm/pull/394#discussion_r24060605
--- Diff: storm-core/src/clj/backtype/storm/daemon/nimbus.clj ---
@@ -18,12 +18,17 @@
[java.util Collections])
(:import [java.io FileNotFoundException])
(:import [java.nio.channels Channels WritableByteChannel])
+ (:import [backtype.storm.utils VersionInfo])
(:import [backtype.storm.security.auth ThriftServer ThriftConnectionType
ReqContext AuthUtils])
(:use [backtype.storm.scheduler.DefaultScheduler])
(:import [backtype.storm.scheduler INimbus SupervisorDetails WorkerSlot
TopologyDetails
Cluster Topologies SchedulerAssignment SchedulerAssignmentImpl
DefaultScheduler ExecutorDetails])
+<<<<<<< HEAD
--- End diff --
Sorry.
I have fixed the merge conflicts . Please do try again.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
