Fixes incorrect removal of default property
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/13f6d234 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/13f6d234 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/13f6d234 Branch: refs/heads/two-dot-o-dev Commit: 13f6d2344e14b6840a52e2f5a04eceb0af185119 Parents: 117ab5c Author: Todd Nine <tn...@apigee.com> Authored: Tue Aug 11 16:21:13 2015 -0600 Committer: Todd Nine <tn...@apigee.com> Committed: Tue Aug 11 16:36:37 2015 -0600 ---------------------------------------------------------------------- stack/config/src/main/resources/usergrid-default.properties | 2 +- .../src/test/java/org/apache/usergrid/persistence/CounterIT.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/13f6d234/stack/config/src/main/resources/usergrid-default.properties ---------------------------------------------------------------------- diff --git a/stack/config/src/main/resources/usergrid-default.properties b/stack/config/src/main/resources/usergrid-default.properties index 3bcb821..33889ac 100644 --- a/stack/config/src/main/resources/usergrid-default.properties +++ b/stack/config/src/main/resources/usergrid-default.properties @@ -570,7 +570,7 @@ usergrid.counter.batch.size=1000 # Set the time interval for when to submit counter batches. # -#usergrid.counter.batch.interval=30 +usergrid.counter.batch.interval=30 # Set build number for display # Note: ${version is obtained from the pom.xml <version>} http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/13f6d234/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java index 079df0d..d1abde5 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java @@ -290,7 +290,7 @@ public class CounterIT extends AbstractCoreIT { // UUID groupId = UUID.randomUUID(); - Event event = null; + Event event; for ( int i = 0; i < 100; i++ ) { event = new Event(); @@ -318,7 +318,7 @@ public class CounterIT extends AbstractCoreIT { final String name = counter.getName(); assertEquals("visits", name); - assertEquals(count, 200); + assertEquals(200, count); } }
