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 2015/10/09 16:09:25 UTC
[3/3] storm git commit: Added STORM-1096 to Changelog
Added STORM-1096 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3f79c2f4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3f79c2f4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3f79c2f4
Branch: refs/heads/master
Commit: 3f79c2f40380ce2632db324afec1f251a1746846
Parents: 0aa1937
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Oct 9 08:59:15 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Oct 9 08:59:15 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 3 +++
dev-tools/storm-merge.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3f79c2f4/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96bec08..1fb0633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,6 +107,9 @@
* STORM-742: Let ShellBolt treat all messages to update heartbeat
* STORM-992: A bug in the timer.clj might cause unexpected delay to schedule new event
+## 0.10.0
+ * STORM-1096: Fix some issues with impersonation on the UI
+
## 0.10.0-beta1
* STORM-873: Flux does not handle diamond topologies
http://git-wip-us.apache.org/repos/asf/storm/blob/3f79c2f4/dev-tools/storm-merge.py
----------------------------------------------------------------------
diff --git a/dev-tools/storm-merge.py b/dev-tools/storm-merge.py
index ed06216..33690c2 100755
--- a/dev-tools/storm-merge.py
+++ b/dev-tools/storm-merge.py
@@ -24,7 +24,7 @@ def main():
for pullNumber in args:
pull = github.pull("apache", "storm", pullNumber)
- print "git pull "+pull.from_repo()+" "+pull.from_branch()
+ print "git pull --no-ff "+pull.from_repo()+" "+pull.from_branch()
if __name__ == "__main__":
main()