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/35fddfe1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/35fddfe1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/35fddfe1 Branch: refs/heads/two-dot-o Commit: 35fddfe1257acb227fbbd7a7922dceb6a4e625f2 Parents: cfe5f4d 2697a21 Author: Alex Karasulu <[email protected]> Authored: Thu Jan 16 01:30:07 2014 +0200 Committer: Alex Karasulu <[email protected]> Committed: Thu Jan 16 01:30:07 2014 +0200 ---------------------------------------------------------------------- .../cassandra/RelationManagerImpl.java | 27 +++++++----- .../rest/applications/ApplicationResource.java | 6 +++ .../users/ConnectionResourceTest.java | 43 ++++++++++++++++++++ 3 files changed, 66 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
