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 2014/03/24 16:21:00 UTC
[13/18] git commit: Merge branch 'two-dot-o' of
https://github.com/usergrid/usergrid into two-dot-o
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid 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/c4f9d0f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c4f9d0f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c4f9d0f2
Branch: refs/heads/hystrix-integration
Commit: c4f9d0f20ee4c342f7fec643f4eca35d2c384518
Parents: e1b4cff a705630
Author: Dave Johnson <dm...@apigee.com>
Authored: Sat Mar 22 18:16:08 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sat Mar 22 18:16:08 2014 -0400
----------------------------------------------------------------------
.../src/main/groovy/wait_for_instances.groovy | 2 +-
.../graph/consistency/AsyncProcessor.java | 14 +-
.../graph/consistency/AsyncProcessorImpl.java | 94 ++++++-
.../graph/consistency/TimeService.java | 33 +++
.../persistence/graph/guice/GraphModule.java | 7 +-
.../graph/consistency/AsyncProcessorTest.java | 273 +++++++++++++++++++
6 files changed, 409 insertions(+), 14 deletions(-)
----------------------------------------------------------------------