Merge branch 'es-type-updates-ryan-external' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into es-type-updates-ryan-external
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/de457e90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/de457e90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/de457e90 Branch: refs/heads/two-dot-o Commit: de457e9026b7c92c697c6cb026c8554f16ebab92 Parents: 8ae98f8 0fc8818 Author: Todd Nine <[email protected]> Authored: Tue Nov 11 09:16:45 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Tue Nov 11 09:16:45 2014 -0700 ---------------------------------------------------------------------- .../apache/usergrid/rest/AbstractRestIT.java | 22 +- .../apache/usergrid/rest/TestContextSetup.java | 10 +- .../rest/management/OrganizationsIT.java | 328 +++++++++---------- .../usergrid/rest/test/security/TestUser.java | 3 + 4 files changed, 185 insertions(+), 178 deletions(-) ----------------------------------------------------------------------
