Merge remote branch 'origin/master'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2691fb7..1fa3bb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.3-rc2
+ * STORM-492: Test timeout should be configurable
* STORM-540: Change default time format in logs to ISO8601 in order to include timezone
* STORM-511: Storm-Kafka spout keeps sending fetch requests with invalid offset
* STORM-538: Guava com.google.thirdparty.publicsuffix is not shaded
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 4af1e3c..b6c0b84 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -230,7 +230,8 @@
$ mvn clean install
# Build the code and run the tests, with specifying default test timeout (in millisecond)
- $ mvn clean install -DSTORM_TEST_TIMEOUT_MS=10000
+ $ export STORM_TEST_TIMEOUT_MS=10000
+ $ mvn clean install
# Build the code but skip the tests
$ mvn clean install -DskipTests=true
diff --git a/LICENSE b/LICENSE
index e30786b..2c7adb3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -206,7 +206,19 @@
For jQuery 1.6.2 (storm-core/src/ui/public/js/jquery-1.6.2.min.js)
-Copyright (c) 2009 John Resig, http://jquery.com/
+jQuery JavaScript Library v1.6.2
+http://jquery.com/
+
+Copyright 2011, John Resig
+Dual licensed under the MIT or GPL Version 2 licenses.
+http://jquery.org/license
+
+Includes Sizzle.js
+http://sizzlejs.com/
+Copyright 2011, The Dojo Foundation
+Released under the MIT, BSD, and GPL Licenses.
+
+MIT license selected:
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/storm-core/src/clj/backtype/storm/testing.clj b/storm-core/src/clj/backtype/storm/testing.clj
index 79d3277..1ea1227 100644
--- a/storm-core/src/clj/backtype/storm/testing.clj
+++ b/storm-core/src/clj/backtype/storm/testing.clj
@@ -188,7 +188,7 @@
(catch Exception e (log-message (.getMessage e)))) ))
(def TEST-TIMEOUT-MS
- (let [timeout (System/getProperty "STORM_TEST_TIMEOUT_MS")]
+ (let [timeout (System/getenv "STORM_TEST_TIMEOUT_MS")]
(parse-int (if timeout timeout "5000"))))
(defmacro while-timeout [timeout-ms condition & body]
diff --git a/storm-core/src/clj/backtype/storm/testing4j.clj b/storm-core/src/clj/backtype/storm/testing4j.clj
index 7790b6b..9f89698 100644
--- a/storm-core/src/clj/backtype/storm/testing4j.clj
+++ b/storm-core/src/clj/backtype/storm/testing4j.clj
@@ -125,7 +125,7 @@
(defn -trackedWait
([^TrackedTopology trackedTopology ^Integer amt ^Integer timeout-ms]
- (tracked-wait trackedTopology amt timeout-ms))
+ (tracked-wait trackedTopology amt timeout-ms))
([^TrackedTopology trackedTopology ^Integer amt]
(tracked-wait trackedTopology amt))
([^TrackedTopology trackedTopology]
diff --git a/storm-dist/binary/LICENSE b/storm-dist/binary/LICENSE
index 5ad9e5d..1a8c4a8 100644
--- a/storm-dist/binary/LICENSE
+++ b/storm-dist/binary/LICENSE
@@ -245,10 +245,21 @@
-----------------------------------------------------------------------
-
For jQuery 1.6.2 (storm-core/src/ui/public/js/jquery-1.6.2.min.js)
-Copyright (c) 2009 John Resig, http://jquery.com/
+jQuery JavaScript Library v1.6.2
+http://jquery.com/
+
+Copyright 2011, John Resig
+Dual licensed under the MIT or GPL Version 2 licenses.
+http://jquery.org/license
+
+Includes Sizzle.js
+http://sizzlejs.com/
+Copyright 2011, The Dojo Foundation
+Released under the MIT, BSD, and GPL Licenses.
+
+MIT license selected:
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
