usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [4/4] incubator-usergrid git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
Date Tue, 03 Mar 2015 20:33:55 GMT
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/USERGRID-280
Commit: ebf6e1322db6d46a2e5d959d39aa4c3be03ec8a7
Parents: fa47d2d b31088a
Author: grey <greyes@apigee.com>
Authored: Tue Mar 3 12:31:10 2015 -0800
Committer: grey <greyes@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(-)
----------------------------------------------------------------------



Mime
View raw message