You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/12/07 14:54:39 UTC

[1/3] storm git commit: Pass delete-node-blobstore through to zk-state

Repository: storm
Updated Branches:
  refs/heads/master 10b33a61b -> 3600953b6


Pass delete-node-blobstore through to zk-state


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/812cc1ec
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/812cc1ec
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/812cc1ec

Branch: refs/heads/master
Commit: 812cc1ec1e99509523aa27a1d064fd14e28d4391
Parents: 79a2a2a
Author: Ilya Ostrovskiy <il...@socialrank.com>
Authored: Sat Dec 5 10:29:36 2015 -0500
Committer: Ilya Ostrovskiy <il...@socialrank.com>
Committed: Mon Dec 7 08:39:56 2015 -0500

----------------------------------------------------------------------
 .../src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/812cc1ec/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
index 537397a..d99442b 100644
--- a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
+++ b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
@@ -53,6 +53,7 @@
       (create_sequential [this path data acls] (.create_sequential zk-state path data acls))
       (set_data [this path data acls] (.set_data zk-state path data acls))
       (delete_node [this path] (.delete_node zk-state path))
+      (delete_node_blobstore [this path nimbus-host-port-info] (.delete_node_blobstore zk-state path nimbus-host-port-info))
       (get_data [this path watch?] (.get_data zk-state path watch?))
       (get_data_with_version [this path watch?] (.get_data_with_version zk-state path watch?))
       (get_version [this path watch?] (.get_version zk-state path watch?))


[2/3] storm git commit: Merge branch 'pacemaker-blobstore' of https://github.com/socialrank/storm into STORM-1375

Posted by ka...@apache.org.
Merge branch 'pacemaker-blobstore' of https://github.com/socialrank/storm into STORM-1375


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0e46b02d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0e46b02d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0e46b02d

Branch: refs/heads/master
Commit: 0e46b02d6b9a814bd715bfdc0340806e05d95591
Parents: 10b33a6 812cc1e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Dec 7 22:52:32 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Dec 7 22:52:32 2015 +0900

----------------------------------------------------------------------
 .../src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------



[3/3] storm git commit: add STORM-1375 to CHANGELOG.md

Posted by ka...@apache.org.
add STORM-1375 to CHANGELOG.md

* also add Ilya Ostrovskiy to contributor list


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3600953b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3600953b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3600953b

Branch: refs/heads/master
Commit: 3600953b6e53610ddc606b88e1816b05e2698eca
Parents: 0e46b02
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Dec 7 22:54:00 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Dec 7 22:54:00 2015 +0900

----------------------------------------------------------------------
 CHANGELOG.md    | 1 +
 README.markdown | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/3600953b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5254cbb..0821bd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-1375: Blobstore broke Pacemaker
  * STORM-876: Blobstore/DistCache Support
  * STORM-1361: Apache License missing from two Cassandra files
  * STORM-756: Handle taskids response as soon as possible

http://git-wip-us.apache.org/repos/asf/storm/blob/3600953b/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 4eef88a..a569144 100644
--- a/README.markdown
+++ b/README.markdown
@@ -244,6 +244,7 @@ under the License.
 * Victor Wong ([@victor-wong](https://github.com/victor-wong))
 * David Wimsey ([@dwimsey](https://github.com/dwimsey))
 * Florian Hussonnois ([@fhussonnois](https://github.com/fhussonnois))
+* Ilya Ostrovskiy ([@iostat](https://github.com/iostat))
 
 ## Acknowledgements