You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/01/06 15:02:40 UTC

[2/2] incubator-usergrid git commit: Merge branch 'pr/137' This closes #137.

Merge branch 'pr/137' This closes #137.


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

Branch: refs/heads/master
Commit: 2841db61d6b2b35003aabb10422eba19dee6da18
Parents: b14f575 fa82a16
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Jan 6 08:11:37 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Jan 6 08:11:37 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/usergrid/utils/BCrypt.java  | 627 -------------------
 stack/launcher/pom.xml                          |   5 +
 stack/pom.xml                                   |   8 +-
 stack/rest/pom.xml                              |   5 +
 stack/services/pom.xml                          |   5 +
 .../security/crypto/command/BcryptCommand.java  |   4 +-
 6 files changed, 22 insertions(+), 632 deletions(-)
----------------------------------------------------------------------