Repository: incubator-usergrid Updated Branches: refs/heads/two-dot-o cc0b774ff -> 5f6ca3164
Merge pull request #62 from shawnfeldman/master USERGRID-3154: After following user activities don't show up Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f368246c Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f368246c Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f368246c Branch: refs/heads/two-dot-o Commit: f368246c6d9357eaa33eaea9976575c653585c4b Parents: e33c928 85453b9 Author: Dave Johnson <[email protected]> Authored: Thu Feb 27 18:13:37 2014 -0500 Committer: Dave Johnson <[email protected]> Committed: Thu Feb 27 18:13:37 2014 -0500 ---------------------------------------------------------------------- .../rest/management/ManagementResourceIT.java | 92 +++++++++++++++++++- .../users/activities/ActivitiesService.java | 36 +++++--- 2 files changed, 115 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f368246c/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f368246c/stack/services/src/main/java/org/apache/usergrid/services/users/activities/ActivitiesService.java ----------------------------------------------------------------------
