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/04/04 17:20:55 UTC

[04/15] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Todd Nine
# Via Todd Nine
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Ignored test until mockito issues are resolved


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b341b044
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b341b044
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b341b044

Branch: refs/pull/77/merge
Commit: b341b044bf223abded454129931475ed3f04cea1
Parents: 5a1bcb9 289d66c
Author: grey <gr...@apigee.com>
Authored: Fri Mar 28 10:10:21 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Mar 28 10:10:21 2014 -0700

----------------------------------------------------------------------
 .../usergrid/persistence/graph/GraphManagerTimeoutIT.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------