nasty merge

This commit is contained in:
Bill Burke committed 2013-11-05 23:12:07 -05:00
commit 2861ea0e96
97 files changed
+2133 -1870

No files matched your search

@@ -78,13 +78,6 @@ public class CreateUsersWorker implements Worker {
user.setEmail(username + "@email.com");
}
// Adding default roles of realm to user
if (addDefaultRoles) {
for (RoleModel role : realm.getDefaultRoles()) {
realm.grantRole(user, role);
}
}
// Creating password (will be same as username)
if (addPassword) {
UserCredentialModel password = new UserCredentialModel();