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 2015/03/04 23:39:32 UTC

[37/38] incubator-usergrid git commit: Merge branch 'pr/172' into two-dot-o

Merge branch 'pr/172' 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/c1f5b784
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c1f5b784
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c1f5b784

Branch: refs/heads/USERGRID-432
Commit: c1f5b78429b1017bf7bc685c7c09f5c762ab7027
Parents: 39c732b 4588a01
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Mar 4 10:47:54 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Mar 4 10:47:54 2015 -0700

----------------------------------------------------------------------
 .../apache/usergrid/rest/SystemResourceIT.java  | 60 ++++++++++++++++++++
 .../rest/test/resource2point0/RestClient.java   |  5 ++
 .../endpoints/DatabaseResource.java             | 39 +++++++++++++
 .../endpoints/SetupResource.java                | 46 +++++++++++++++
 .../endpoints/SystemResource.java               | 36 ++++++++++++
 .../cassandra/ManagementServiceImpl.java        |  7 ++-
 6 files changed, 192 insertions(+), 1 deletion(-)
----------------------------------------------------------------------