diff --git a/.travis.yml b/.travis.yml
index 0c3bc6d..807ffd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ script:
- mvn verify
after_success:
- mvn coveralls:report
-- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_TAG}" != "" && mvn deploy --settings travis/settings.xml
+- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_BRANCH}" != "master" && mvn deploy --settings travis/settings.xml
cache:
directories:
- "~/.m2"
diff --git a/Makefile b/Makefile
index b6b9824..f607c18 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ jar:
mvn clean package
release:
- mvn -B release:prepare release:clean
+ mvn -B release:prepare release:clean && git checkout `git describe --abbrev=0` -b `git describe --abbrev=0` && git push -u origin HEAD && git checkout master && git pull
coverage:
mvn clean clover2:setup test clover2:aggregate clover2:clover
diff --git a/pom.xml b/pom.xml
index 39341ff..f8fef3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
2.2.0
2.2.0
2.10.2
- 1.2.0
- 1.1.1
+ 1.2.1
+ 1.1.2
diff --git a/src/main/java/com/yahoo/bullet/storm/BulletStormConfig.java b/src/main/java/com/yahoo/bullet/storm/BulletStormConfig.java
index dcc7227..3c61438 100644
--- a/src/main/java/com/yahoo/bullet/storm/BulletStormConfig.java
+++ b/src/main/java/com/yahoo/bullet/storm/BulletStormConfig.java
@@ -96,8 +96,8 @@ public class BulletStormConfig extends BulletConfig implements Serializable {
public static final Map DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING = new HashMap<>();
public static final String DEFAULT_BUILT_IN_METRICS_INTERVAL_KEY = "default";
static {
- DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING.put("bullet_active_queries", 10L);
- DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING.put(DEFAULT_BUILT_IN_METRICS_INTERVAL_KEY, 10L);
+ DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING.put("bullet_active_queries", 10);
+ DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING.put(DEFAULT_BUILT_IN_METRICS_INTERVAL_KEY, 10);
}
public static final List DEFAULT_TOPOLOGY_METRICS_CLASSES = new ArrayList<>();
static {