From 5702e59ced32ae62aed9f59a26bd67136f092361 Mon Sep 17 00:00:00 2001
From: Alessandro Bellina <abellina@yahoo-inc.com>
Date: Mon, 29 Aug 2016 07:44:18 -0500
Subject: [PATCH 1/2] STORM-2063: allow default thread name in case we don't
 have a better name for it, turn on %t in worker.xml by default

---
 log4j2/worker.xml                            | 2 +-
 storm-core/src/clj/org/apache/storm/util.clj | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index a9aeaedd528..f1e23a145ca 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -18,7 +18,7 @@
 
 <configuration monitorInterval="60">
 <properties>
-    <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] %msg%n</property>
+    <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property>
     <property name="patternNoTime">%msg%n</property>
     <property name="patternMetrics">%d %-8r %m%n</property>
 </properties>
diff --git a/storm-core/src/clj/org/apache/storm/util.clj b/storm-core/src/clj/org/apache/storm/util.clj
index 4765de89332..4297a218bd8 100644
--- a/storm-core/src/clj/org/apache/storm/util.clj
+++ b/storm-core/src/clj/org/apache/storm/util.clj
@@ -494,7 +494,8 @@
                        (kill-fn t)))))]
     (.setDaemon thread daemon)
     (.setPriority thread priority)
-    (when thread-name
+    (when-not (clojure.string/blank? thread-name)
+      ;; if thead-name is blank, just use the default thread name
       (.setName thread (str (.getName thread) "-" thread-name)))
     (when start
       (.start thread))

From 367ee482a0e3b1609250bb120fd6b168657ce82f Mon Sep 17 00:00:00 2001
From: Alessandro Bellina <abellina@yahoo-inc.com>
Date: Mon, 29 Aug 2016 09:19:39 -0500
Subject: [PATCH 2/2] Fix 1.x build due to storm--submit-tools pointing at
 non-existing 1.1.1-SNAPSHOT

---
 external/storm-submit-tools/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/storm-submit-tools/pom.xml b/external/storm-submit-tools/pom.xml
index d2237b0c4f2..6e21d23202b 100644
--- a/external/storm-submit-tools/pom.xml
+++ b/external/storm-submit-tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -198,4 +198,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>