You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/22 22:42:52 UTC
[06/13] git commit: Switched properties to now use the correct entry
in the properties file.
Switched properties to now use the correct entry in the properties file.
Signed-off-by: grey <gr...@apigee.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2bfbe416
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2bfbe416
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2bfbe416
Branch: refs/heads/master
Commit: 2bfbe41657061efbae804f74de638778f5a00588
Parents: 1af22d2
Author: grey <gr...@apigee.com>
Authored: Tue Jul 15 15:57:16 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Jul 25 13:39:58 2014 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/management/AccountCreationProps.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2bfbe416/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java b/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
index 9963e8d..90263c4 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
@@ -69,9 +69,11 @@ public interface AccountCreationProps {
public static final String PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION = "usergrid.management.notify_admin_of_activation";
public static final String PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS =
- "usergrid.management.admin_users_require_activation";
+ "usergrid.sysadmin.approve.users";
+ //"usergrid.management.admin_users_require_activation";
public static final String PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS =
- "usergrid.management.organizations_require_activation";
+ "usergrid.sysadmin.approve.organizations";
+ //"usergrid.management.organizations_require_activation";
public static final String PROPERTIES_NOTIFY_SYSADMIN_OF_NEW_ORGANIZATIONS =
"usergrid.management.notify_sysadmin_of_new_organizations";
public static final String PROPERTIES_NOTIFY_SYSADMIN_OF_NEW_ADMIN_USERS =