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/06/01 23:56:25 UTC

[3/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-628

Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-628


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/42f45efe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/42f45efe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/42f45efe

Branch: refs/heads/two-dot-o-dev
Commit: 42f45efe8cf0d47ec4cee51f10ed6578fc3406c1
Parents: f174757 45ce5d2
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Jun 1 15:43:51 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Jun 1 15:43:51 2015 -0600

----------------------------------------------------------------------
 .../rest/management/ManagementResourceIT.java   | 229 ++++++-------------
 .../endpoints/NamedResource.java                |   9 +
 .../endpoints/mgmt/ManagementResource.java      |   4 +
 .../endpoints/mgmt/TokenResource.java           |   8 +
 4 files changed, 94 insertions(+), 156 deletions(-)
----------------------------------------------------------------------