You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2014/09/04 00:11:14 UTC
[19/52] [abbrv] git commit: Merge branch 'pr/70' into two-dot-o
Merge branch 'pr/70' into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8b2c1b71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8b2c1b71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8b2c1b71
Branch: refs/heads/two-dot-o-push-notifications
Commit: 8b2c1b71dff1e112a1b67612b68e5ac3ed43431d
Parents: efdc08d 9ddb537
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Aug 28 16:26:56 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Aug 28 16:26:56 2014 -0400
----------------------------------------------------------------------
.../usergrid/batch/job/SchedulerRuntime2IT.java | 54 ++++++++++----------
.../usergrid/batch/job/SchedulerRuntime3IT.java | 2 +
.../usergrid/persistence/CollectionIT.java | 17 +++---
.../persistence/GeoQueryBooleanTest.java | 2 +
.../exception/CollectionRuntimeException.java | 1 -
.../MvccEntitySerializationStrategyImpl.java | 16 +++++-
.../persistence/index/impl/EntityIndexTest.java | 19 +++++++
.../src/test/resources/log4j.properties | 6 ++-
stack/pom.xml | 6 ++-
.../test/resources/usergrid-test-context.xml | 3 +-
10 files changed, 86 insertions(+), 40 deletions(-)
----------------------------------------------------------------------