You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2015/03/03 21:38:40 UTC
[18/18] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
# By Dave Johnson (1) and Rod Simpson (1)
# Via Rod Simpson
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Revert "Merge remote-tracking branch 'gerey/USERGRID-280' into apache_usergrid/two-dot-o"
This fixes many tests in ApplicationResourceIT. This is a technically a merge but Usergrid 333 was already merged into two-dot-o.
Conflicts:
stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/UserResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ebf6e132
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ebf6e132
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ebf6e132
Branch: refs/heads/two-dot-o
Commit: ebf6e1322db6d46a2e5d959d39aa4c3be03ec8a7
Parents: fa47d2d b31088a
Author: grey <gr...@apigee.com>
Authored: Tue Mar 3 12:31:10 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Mar 3 12:31:10 2015 -0800
----------------------------------------------------------------------
.../usergrid/rest/test/resource2point0/model/Credentials.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------