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/01/09 22:30:15 UTC
[1/3] storm git commit: Fix calls to submit-mocked-assignment:
executor id should be of the form [first-task last-task]
Repository: storm
Updated Branches:
refs/heads/master a1268f110 -> 8e43c2513
Fix calls to submit-mocked-assignment: executor id should be of the form [first-task last-task]
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/26c40084
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/26c40084
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/26c40084
Branch: refs/heads/master
Commit: 26c4008485928daf7592373d305af8893cbfaf40
Parents: cfe7e63
Author: Mansheng Yang <ma...@gmail.com>
Authored: Wed Nov 19 20:39:03 2014 +0800
Committer: Mansheng Yang <ma...@gmail.com>
Committed: Sun Nov 30 12:42:23 2014 +0800
----------------------------------------------------------------------
.../test/clj/backtype/storm/supervisor_test.clj | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/26c40084/storm-core/test/clj/backtype/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj
index ba74d88..40cebb0 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -90,10 +90,10 @@
2 "1"
3 "1"
4 "1"}
- {[1] ["sup1" 1]
- [2] ["sup1" 2]
- [3] ["sup1" 3]
- [4] ["sup1" 3]
+ {[1 1] ["sup1" 1]
+ [2 2] ["sup1" 2]
+ [3 3] ["sup1" 3]
+ [4 4] ["sup1" 3]
})
(advance-cluster-time cluster 2)
(heartbeat-workers cluster "sup1" [1 2 3])
@@ -141,10 +141,10 @@
2 "1"
3 "1"
4 "1"}
- {[1] ["sup1" 1]
- [2] ["sup1" 2]
- [3] ["sup2" 1]
- [4] ["sup2" 1]
+ {[1 1] ["sup1" 1]
+ [2 2] ["sup1" 2]
+ [3 3] ["sup2" 1]
+ [4 4] ["sup2" 1]
})
(advance-cluster-time cluster 2)
(heartbeat-workers cluster "sup1" [1 2])
@@ -162,9 +162,9 @@
{1 "1"
2 "1"
3 "1"}
- {[1] ["sup1" 3]
- [2] ["sup1" 3]
- [3] ["sup2" 2]
+ {[1 1] ["sup1" 3]
+ [2 2] ["sup1" 3]
+ [3 3] ["sup2" 2]
})
(advance-cluster-time cluster 2)
(heartbeat-workers cluster "sup1" [3])
@@ -439,8 +439,8 @@
topology1
{1 "1"
2 "1"}
- {[1] ["sup1" 1]
- [2] ["sup1" 2]
+ {[1 1] ["sup1" 1]
+ [2 2] ["sup1" 2]
})
(submit-mocked-assignment
(:nimbus cluster)
@@ -449,8 +449,8 @@
topology2
{1 "1"
2 "1"}
- {[1] ["sup1" 1]
- [2] ["sup1" 2]
+ {[1 1] ["sup1" 1]
+ [2 2] ["sup1" 2]
})
(advance-cluster-time cluster 10)
))
@@ -469,4 +469,4 @@
(validate-launched-once (:launched changed)
{"sup1" [3 4]}
(get-storm-id (:storm-cluster-state cluster) "topology2"))
- )))
\ No newline at end of file
+ )))
[3/3] storm git commit: Added STORM-578 to changelog and readme
Posted by bo...@apache.org.
Added STORM-578 to changelog and readme
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8e43c251
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8e43c251
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8e43c251
Branch: refs/heads/master
Commit: 8e43c25130b55b0215ff70fa70a6eeb2b8246728
Parents: ca5e85e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jan 9 15:15:47 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jan 9 15:15:47 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8e43c251/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42db893..9626a28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
* STORM-410: Add groups support to log-viewer
* STORM-444: Add AutoHDFS like credential fetching for HBase
* STORM-552: Add netty socket backlog config
+ * STORM-578: Calls to submit-mocked-assignment in supervisor-test use invalid executor-id format
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor
http://git-wip-us.apache.org/repos/asf/storm/blob/8e43c251/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 7f4f57d..26e773b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -182,6 +182,7 @@ under the License.
* Matthew Siegel ([@msiegel07](https://github.com/msiegel07))
* Jun Xia ([@tedxia](https://github.com/tedxia))
* caofangkun ([@caofangkun](https://github.com/caofangkun))
+* Mansheng Yang ([@lightyang](https://github.com/lightyang))
## Acknowledgements
[2/3] storm git commit: Merge branch 'fix-test' of
http://github.com/lightyang/incubator-storm into STORM-578
Posted by bo...@apache.org.
Merge branch 'fix-test' of http://github.com/lightyang/incubator-storm into STORM-578
STORM-578: Calls to submit-mocked-assignment in supervisor-test use invalid executor-id format
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ca5e85ea
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca5e85ea
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ca5e85ea
Branch: refs/heads/master
Commit: ca5e85ea7532775b1dc3da25fa6b13671b559251
Parents: a1268f1 26c4008
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jan 9 15:14:01 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jan 9 15:14:01 2015 -0600
----------------------------------------------------------------------
.../test/clj/backtype/storm/supervisor_test.clj | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ca5e85ea/storm-core/test/clj/backtype/storm/supervisor_test.clj
----------------------------------------------------------------------