You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/06/10 03:00:22 UTC
[28/28] storm git commit: Merge branch 'master' into 0.10.x-branch
Merge branch 'master' into 0.10.x-branch
Conflicts:
CHANGELOG.md
bin/storm-config.cmd
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7bca912e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7bca912e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7bca912e
Branch: refs/heads/0.10.x-branch
Commit: 7bca912e8fbb9ae607ef85af6fcce67ee1dd3046
Parents: 64f46eb 27bc183
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 20:59:13 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 20:59:13 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 3 +
NOTICE | 4 +-
docs/_posts/2015-06-04-storm095-released.md | 23 ++
docs/downloads.html | 59 +++--
examples/storm-starter/README.markdown | 8 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 12 +-
.../serialization/BlowfishTupleSerializer.java | 5 +-
.../jvm/backtype/storm/utils/ShellProcess.java | 8 +-
storm-dist/binary/LICENSE | 224 ++++++++++++++-----
storm-dist/binary/NOTICE | 4 +-
10 files changed, 258 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7bca912e/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 5318a8b,99e8a61..6245f5f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,4 -1,9 +1,7 @@@
-## 0.11.0
-
## 0.10.0
+ * STORM-852: Replaced Apache Log4j Logger with SLF4J API
+ * STORM-813: Change storm-starter's README so that it explains mvn exec:java cannot run multilang topology
+ * STORM-853: Fix upload API to handle multi-args properly
* STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml
* STORM-848: Shade external dependencies
* STORM-849: Add storm-redis to storm binary distribution