Added STORM-1096 to Changelog

aiping312 · Oct 9, 2015 · 3f79c2f · 3f79c2f
1 parent 0aa1937
commit 3f79c2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
 

diff --git 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()