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/05/14 17:45:53 UTC
[2/2] git commit: Merge branch 'STORM-317' of
https://github.com/miguno/incubator-storm into STORM-317
Merge branch 'STORM-317' of https://github.com/miguno/incubator-storm into STORM-317
STORM-317: Add SECURITY.md to release binaries
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/222c7250
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/222c7250
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/222c7250
Branch: refs/heads/master
Commit: 222c72502d57d37f0b2ee9a63f2765039205bbaf
Parents: 7959923 a89d396
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Wed May 14 15:43:00 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Wed May 14 15:43:00 2014 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
storm-dist/binary/src/main/assembly/binary.xml | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/222c7250/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 2ed29cb,103d7e3..e3053bb
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,10 -1,5 +1,11 @@@
## 0.9.2-incubating (unreleased)
+ * STORM-317: Add SECURITY.md to release binaries
+ * STORM-310: Change Twitter authentication
+ * STORM-305: Create developer documentation
+ * STORM-280: storm unit tests are failing on windows
+ * STORM-298: Logback file does not include full path for metrics appender fileNamePattern
+ * STORM-316: added validation to registermetrics to have timebucketSizeInSecs >= 1
+ * STORM-315: Added progress bar when submitting topology
* STORM-214: Windows: storm.cmd does not properly handle multiple -c arguments
* STORM-306: Add security documentation
* STORM-302: Fix Indentation for pom.xml in storm-dist