usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [10/10] git commit: merge pull request 36
Date Wed, 30 Jul 2014 22:00:26 GMT
merge pull request 36

* apache/add-metrics:
  adding rx to master
  updates for USERGRID-205
  Implements USERGRID-205
  Implements USERGRID-205
  Upgrade JobFactory to only return 1 job, not many for a descriptor since we're not using
it in this way.
  adding an iterator interface to look for extra pages
  Fixes tests to be clearer


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

Branch: refs/heads/master
Commit: d61fba950a7f42ff9a952fbcdf4de7071736596a
Parents: 02ff708 b1efc55
Author: Todd Nine <toddnine@apache.org>
Authored: Wed Jul 30 16:00:03 2014 -0600
Committer: Todd Nine <toddnine@apache.org>
Committed: Wed Jul 30 16:00:03 2014 -0600

----------------------------------------------------------------------
 .../main/resources/usergrid-default.properties  |   4 +-
 stack/core/pom.xml                              |  11 +
 .../java/org/apache/usergrid/batch/Job.java     |  12 +-
 .../org/apache/usergrid/batch/JobFactory.java   |   2 +-
 .../usergrid/batch/UsergridJobFactory.java      |   6 +-
 .../batch/service/JobSchedulerService.java      | 302 +++++++++++++------
 .../persistence/MultiQueryIterator.java         |   6 +-
 .../persistence/ObservableIterator.java         |  82 +++++
 .../persistence/PagingResultsIterator.java      |   7 +-
 .../usergrid/persistence/ResultsIterator.java   |  30 ++
 .../main/resources/usergrid-core-context.xml    |   1 +
 .../apache/usergrid/batch/BulkTestUtils.java    |  10 +-
 .../usergrid/batch/UsergridJobFactoryTest.java  |   3 +-
 .../usergrid/batch/job/CountdownLatchJob.java   |   6 +
 .../usergrid/batch/job/DelayExecution.java      |   6 +
 .../usergrid/batch/job/DelayHeartbeat.java      |   6 +
 .../batch/job/FailureJobExceuction.java         |  74 -----
 .../usergrid/batch/job/FailureJobExecution.java |  87 ++++++
 .../usergrid/batch/job/OnlyOnceExceution.java   |   6 +
 .../job/OnlyOnceUnlockOnFailExceution.java      |   6 +
 .../usergrid/batch/job/SchedulerRuntime1IT.java |   5 +-
 .../usergrid/batch/job/SchedulerRuntime2IT.java |  13 +-
 .../usergrid/batch/job/SchedulerRuntime3IT.java |  34 ++-
 .../usergrid/batch/job/SchedulerRuntime4IT.java |  11 +-
 .../usergrid/batch/job/SchedulerRuntime5IT.java |   4 +-
 .../usergrid/batch/job/SchedulerRuntime6IT.java |   8 +-
 .../usergrid/batch/job/SchedulerRuntime7IT.java |  11 +-
 .../usergrid/batch/job/SchedulerRuntime8IT.java |   4 +-
 .../batch/job/SchedulerRuntimeIntervalIT.java   | 115 +++++++
 .../usergrid/batch/job/TestJobListener.java     |  67 ++--
 .../usergrid/batch/job/TestJobListenerTest.java |   7 +-
 stack/pom.xml                                   |   1 +
 .../usergrid/management/export/ExportJob.java   |   6 +
 33 files changed, 700 insertions(+), 253 deletions(-)
----------------------------------------------------------------------



Mime
View raw message