You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/08/12 19:48:07 UTC
[4/4] incubator-usergrid git commit: Merge branch 'pr/346' into
two-dot-o-dev
Merge branch 'pr/346' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0794d941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0794d941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0794d941
Branch: refs/heads/two-dot-o-dev
Commit: 0794d9416f3e354d410b714c632529d8016fd8ce
Parents: c556741 90e514a
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 12 13:47:46 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:47:46 2015 -0400
----------------------------------------------------------------------
.../main/resources/usergrid-default.properties | 2 +-
.../src/test/resources/usergrid-test.properties | 1 +
.../apache/usergrid/count/AbstractBatcher.java | 70 ++++++++---
.../main/resources/usergrid-core-context.xml | 1 +
.../apache/usergrid/persistence/CounterIT.java | 119 ++++++++++++++-----
5 files changed, 145 insertions(+), 48 deletions(-)
----------------------------------------------------------------------