usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [1/8] git commit: Switched properties to now use the correct entry in the properties file.
Date Fri, 25 Jul 2014 16:58:47 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/master df6b84a76 -> 7234d70aa
  refs/heads/two-dot-o 3392c2e24 -> b1e41a05d


Switched properties to now use the correct entry in the properties file.


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

Branch: refs/heads/master
Commit: 6a12e3049e08a1d787283aa37c5535120dced822
Parents: 585640e
Author: grey <greyes@apigee.com>
Authored: Tue Jul 15 15:57:16 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Tue Jul 15 15:57:16 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/6a12e304/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 =


Mime
View raw message