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/01/16 18:30:28 UTC

[32/51] [abbrv] 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/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/pull/18/merge
Commit: 35fddfe1257acb227fbbd7a7922dceb6a4e625f2
Parents: cfe5f4d 2697a21
Author: Alex Karasulu <ak...@gmail.com>
Authored: Thu Jan 16 01:30:07 2014 +0200
Committer: Alex Karasulu <ak...@gmail.com>
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(-)
----------------------------------------------------------------------