You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/23 23:48:43 UTC
[7/7] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-events
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c5195a4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c5195a4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c5195a4d
Branch: refs/heads/two-dot-o-events
Commit: c5195a4dff1d8223b04e7d9f4ac64c3fe276917e
Parents: daebd25 fc3c42c
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Oct 23 15:42:35 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Oct 23 15:42:35 2014 -0600
----------------------------------------------------------------------
.../queue/impl/SQSQueueManagerImpl.java | 76 +++++++++++---------
.../usergrid/rest/TextToJsonSwapWriter.java | 8 ++-
.../applications/ApplicationResourceIT.java | 2 -
.../usergrid/rest/management/AdminUsersIT.java | 6 --
4 files changed, 50 insertions(+), 42 deletions(-)
----------------------------------------------------------------------