You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/08/12 22:11:21 UTC

[3/3] incubator-usergrid git commit: Merge branch 'recaptcha-fix'

Merge branch 'recaptcha-fix'

* recaptcha-fix:
  Adding additional logging and exception handling to recaptcha
  Fix logic issue when recaptcha is disabled


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

Branch: refs/heads/master
Commit: f011b3dddf93998a799dfe48e632f0d8856d8792
Parents: 8e32c13 2b336ef
Author: GERey <gr...@apigee.com>
Authored: Wed Aug 12 12:50:26 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Aug 12 12:50:26 2015 -0700

----------------------------------------------------------------------
 .../rest/applications/users/UsersResource.java  | 50 ++++++++--------
 .../rest/management/users/UsersResource.java    | 63 ++++++++------------
 2 files changed, 50 insertions(+), 63 deletions(-)
----------------------------------------------------------------------