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 2014/07/29 22:58:20 UTC
[21/50] git commit: Updated License, Changelog,
and README for STORM-364.
Updated License, Changelog, and README for STORM-364.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/7ac24b89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/7ac24b89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/7ac24b89
Branch: refs/heads/security
Commit: 7ac24b893c2162c96efb4dfdee16e6109510283b
Parents: aa0139c
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Tue Jul 22 08:53:55 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Tue Jul 22 08:53:55 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
LICENSE | 28 ++++++++++++++++++++++++++++
README.markdown | 1 +
3 files changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7ac24b89/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 661283f..a3a564e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
* STORM-254: one Spout/Bolt can register metric twice with same name in different timeBucket
* STORM-403: heartbeats-to-nimbus in supervisor-test failed due to uninten...
* STORM-402: FileNotFoundException when using storm with apache tika
+ * STORM-364: The exception time display as default timezone.
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7ac24b89/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4efd7ee..18ba484 100644
--- a/LICENSE
+++ b/LICENSE
@@ -405,3 +405,31 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
+-----------------------------------------------------------------------
+
+For moment.js (storm-core/src/ui/public/js/moment.min.js)
+
+Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7ac24b89/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 8a7afc3..341b62c 100644
--- a/README.markdown
+++ b/README.markdown
@@ -154,6 +154,7 @@ under the License.
* Aaron Levin ([@aaronlevin](https://github.com/aaronlevin))
* Masatake Iwasaki ([@iwasakims](https://github.com/iwasakims))
* Milad Fatenejad ([@icksa](https://github.com/icksa))
+* Ryan Liu ([@shell0dh](https://github.com/shell0dh))
## Acknowledgements