You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2015/11/15 17:29:12 UTC
[1/2] usergrid git commit: Cleanup some name changes on the response
import tasks scheduler.
Repository: usergrid
Updated Branches:
refs/heads/master 044b14963 -> fdcae67fa
Cleanup some name changes on the response import tasks scheduler.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8ed1bc78
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8ed1bc78
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8ed1bc78
Branch: refs/heads/master
Commit: 8ed1bc784e386eac14670fbe71d0e4516625559d
Parents: d4d3ed3
Author: Michael Russo <mi...@gmail.com>
Authored: Sun Nov 15 08:11:42 2015 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Sun Nov 15 08:11:42 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 2 +-
.../asyncevents/AsyncEventsSchedulerFig.java | 18 ------------------
2 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8ed1bc78/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
index 5d2d8dc..8e17701 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
@@ -240,7 +240,7 @@ public class CoreModule extends AbstractModule {
@Inject
@ResponseImportTasks
@Singleton
- public RxTaskScheduler getImportRepairScheduler( final ServiceSchedulerFig serviceSchedulerFig ) {
+ public RxTaskScheduler getResponseImportScheduler(final ServiceSchedulerFig serviceSchedulerFig ) {
final String poolName = serviceSchedulerFig.getRepairPoolName();
final int threadCount = serviceSchedulerFig.getImportThreadPoolSize();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8ed1bc78/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java
index 83eb02e..2ed3a04 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java
@@ -55,17 +55,6 @@ public interface AsyncEventsSchedulerFig extends GuicyFig {
String REPAIR_SCHEDULER_NAME = "repair.io.poolName";
- /**
- * Amount of threads to use in async processing
- */
- String IMPORT_SCHEDULER_THREADS = "import.io.threads";
-
-
- /**
- * Name of pool to use when performing scheduling
- */
- String IMPORT_SCHEDULER_NAME = "import.io.poolName";
-
@Default( "100" )
@Key( IO_SCHEDULER_THREADS )
@@ -84,11 +73,4 @@ public interface AsyncEventsSchedulerFig extends GuicyFig {
@Key( REPAIR_SCHEDULER_NAME )
String getRepairPoolName();
- @Default( "100" )
- @Key( IMPORT_SCHEDULER_THREADS )
- int getMaxImportThreads();
-
- @Default( "Usergrid-Import-Pool" )
- @Key( IMPORT_SCHEDULER_NAME )
- String getImportSchedulerName();
}
[2/2] usergrid git commit: Merge branch '2.1-release' of
https://git-wip-us.apache.org/repos/asf/usergrid
Posted by mr...@apache.org.
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fdcae67f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fdcae67f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fdcae67f
Branch: refs/heads/master
Commit: fdcae67fa7af349fbbb8266925c66b0a9a802083
Parents: 044b149 8ed1bc7
Author: Michael Russo <mi...@gmail.com>
Authored: Sun Nov 15 08:12:35 2015 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Sun Nov 15 08:12:35 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 2 +-
.../asyncevents/AsyncEventsSchedulerFig.java | 18 ------------------
2 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdcae67f/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
----------------------------------------------------------------------