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 2016/02/11 16:34:41 UTC
[1/2] storm git commit: Merge branch 'release1' of
https://github.com/abhishekagarwal87/storm into STORM-1533
Repository: storm
Updated Branches:
refs/heads/1.x-branch 1a2c66a7e -> afbbf2359
Merge branch 'release1' of https://github.com/abhishekagarwal87/storm into STORM-1533
STORM-1533: IntegerValidator for metric consumer parallelism hint
STORM-1534: Pick correct version of jackson-annotations jar
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6a1e54f6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6a1e54f6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6a1e54f6
Branch: refs/heads/1.x-branch
Commit: 6a1e54f62bb82971dacb6097ceec686dfaca3e3c
Parents: 1a2c66a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Feb 11 08:44:22 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Feb 11 09:23:34 2016 -0600
----------------------------------------------------------------------
external/sql/storm-sql-core/pom.xml | 9 +++++++++
pom.xml | 1 -
.../jvm/org/apache/storm/validation/ConfigValidation.java | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6a1e54f6/external/sql/storm-sql-core/pom.xml
----------------------------------------------------------------------
diff --git a/external/sql/storm-sql-core/pom.xml b/external/sql/storm-sql-core/pom.xml
index 6b62e88..0700515 100644
--- a/external/sql/storm-sql-core/pom.xml
+++ b/external/sql/storm-sql-core/pom.xml
@@ -80,9 +80,18 @@
<groupId>org.pentaho</groupId>
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/storm/blob/6a1e54f6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 025fb68..e85e4c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,7 +231,6 @@
<kryo.version>2.21</kryo.version>
<servlet.version>2.5</servlet.version>
<joda-time.version>2.3</joda-time.version>
- <jackson.version>2.3.1</jackson.version>
<thrift.version>0.9.3</thrift.version>
<junit.version>4.11</junit.version>
<metrics-clojure.version>2.5.1</metrics-clojure.version>
http://git-wip-us.apache.org/repos/asf/storm/blob/6a1e54f6/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java b/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java
index 4ec5ffd..edff5cf 100644
--- a/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java
+++ b/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java
@@ -473,7 +473,7 @@ public class ConfigValidation {
}
SimpleTypeValidator.validateField(name, String.class, ((Map) o).get("class"));
- SimpleTypeValidator.validateField(name, Long.class, ((Map) o).get("parallelism.hint"));
+ new IntegerValidator().validateField(name, ((Map) o).get("parallelism.hint"));
}
}
[2/2] storm git commit: Added STORM-1544 and STORM-1534 to Changelog
Posted by bo...@apache.org.
Added STORM-1544 and STORM-1534 to Changelog
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/afbbf235
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/afbbf235
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/afbbf235
Branch: refs/heads/1.x-branch
Commit: afbbf235947ceddf7456e578b7185665d54a5baf
Parents: 6a1e54f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Feb 11 09:32:08 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Feb 11 09:33:47 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/afbbf235/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3c19d6..5777ab1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
## 1.0.0
+ * STORM-1533: IntegerValidator for metric consumer parallelism hint
+ * STORM-1534: Pick correct version of jackson-annotations jar
* STORM-1476: Filter -c options from args and add them as part of storm.options
* STORM-1520: Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
* STORM-1531: Junit and mockito dependencies need to have correct scope defined in storm-elasticsearch pom.xml