You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/01/14 16:44:34 UTC

[1/4] storm git commit: STORM-600: Update version of jacoco plugin.

Repository: storm
Updated Branches:
  refs/heads/master 8e43c2513 -> bcb448d20


STORM-600: Update version of jacoco plugin.


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

Branch: refs/heads/master
Commit: e5f2370dd2cd832dc46bcf16397f76222bad75b8
Parents: da02d8c
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Dec 22 16:33:22 2014 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Dec 22 16:33:22 2014 -0600

----------------------------------------------------------------------
 storm-core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e5f2370d/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 7b4cd75..b695518 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -546,7 +546,7 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.6.1.201212231917</version>
+                        <version>0.7.2.201409121644</version>
                         <executions>
                             <execution>
                                 <id>prepare-agent</id>


[4/4] storm git commit: Update CHANGELOG for STORM-600

Posted by da...@apache.org.
Update CHANGELOG for STORM-600


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

Branch: refs/heads/master
Commit: bcb448d2045e6d82e582779c5b8d211e73b80564
Parents: a784d85
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Wed Jan 14 09:35:27 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Wed Jan 14 09:35:27 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/bcb448d2/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9626a28..23f709c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
  * 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
+ * STORM-600: upgrade jacoco plugin to support jdk8
 
 ## 0.9.3-rc2
  * STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor


[3/4] storm git commit: Merge branch 'STORM-600' of https://github.com/revans2/incubator-storm into STORM-600-merge

Posted by da...@apache.org.
Merge branch 'STORM-600' of https://github.com/revans2/incubator-storm into STORM-600-merge


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

Branch: refs/heads/master
Commit: a784d8573f2fb835be16aa3543db7b1d4acd9953
Parents: 8e43c25 41d1d9c
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Wed Jan 14 09:33:53 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Wed Jan 14 09:33:53 2015 -0600

----------------------------------------------------------------------
 storm-core/pom.xml                                                 | 2 +-
 .../clj/backtype/storm/scheduler/multitenant_scheduler_test.clj    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[2/4] storm git commit: STORM-600: fixed a test that had some issues with scheduling order

Posted by da...@apache.org.
STORM-600: fixed a test that had some issues with scheduling order


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

Branch: refs/heads/master
Commit: 41d1d9c0ef72db56c18fb1cc422f4dd949b32138
Parents: e5f2370
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Dec 22 16:52:33 2014 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Dec 22 16:52:33 2014 -0600

----------------------------------------------------------------------
 .../clj/backtype/storm/scheduler/multitenant_scheduler_test.clj    | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/41d1d9c0/storm-core/test/clj/backtype/storm/scheduler/multitenant_scheduler_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/scheduler/multitenant_scheduler_test.clj b/storm-core/test/clj/backtype/storm/scheduler/multitenant_scheduler_test.clj
index 049a0d6..856121f 100644
--- a/storm-core/test/clj/backtype/storm/scheduler/multitenant_scheduler_test.clj
+++ b/storm-core/test/clj/backtype/storm/scheduler/multitenant_scheduler_test.clj
@@ -622,6 +622,8 @@
       (is (= 4 (.size assigned-slots)))
       (is (= 2 (.size (into #{} (for [slot assigned-slots] (.getNodeId slot))))))
     )
+    ;;The text can be off for a bit until we schedule again
+    (.scheduleAsNeeded isolated-pool (into-array NodePool [free-pool]))
     (is (= "Max Nodes(2) for this user would be exceeded. 1 more nodes needed to run topology." (.get (.getStatusMap cluster) "topology1")))
     (is (= "Scheduled Isolated on 2 Nodes" (.get (.getStatusMap cluster) "topology2")))
 ))