usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [10/10] incubator-usergrid git commit: Merge branch 'two-dot-o' into UG-rest-test-framework-overhaul
Date Thu, 11 Dec 2014 20:53:03 GMT
Merge branch 'two-dot-o' into UG-rest-test-framework-overhaul


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

Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: ce26189f317616048949dce9c13d6efd7c1427f8
Parents: 8437af5 31bb3f1
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Thu Dec 11 13:52:36 2014 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Thu Dec 11 13:52:36 2014 -0700

----------------------------------------------------------------------
 stack/core/pom.xml                              |  15 +-
 .../org/apache/usergrid/AbstractCoreIT.java     |  12 +-
 .../apache/usergrid/ConcurrentCoreITSuite.java  |  51 ----
 .../usergrid/ConcurrentCoreIteratorITSuite.java |  83 ------
 .../usergrid/ConcurrentCoreTestSuite.java       |  46 ----
 .../java/org/apache/usergrid/CoreITSuite.java   |  58 ----
 .../java/org/apache/usergrid/CoreTestSuite.java |  45 ----
 .../apache/usergrid/batch/SchedulerITSuite.java |  50 ----
 .../usergrid/batch/SchedulerTestSuite.java      |  34 ---
 .../batch/job/AbstractSchedulerRuntimeIT.java   |  18 +-
 .../apache/usergrid/persistence/CounterIT.java  |   6 +-
 .../apache/usergrid/persistence/IndexIT.java    |  21 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |  21 +-
 .../query/AbstractIteratingQueryIT.java         |  15 +-
 .../system/UsergridSystemMonitorIT.java         |  14 +-
 stack/services/pom.xml                          | 268 ++++---------------
 .../cassandra/ManagementServiceImpl.java        |   2 -
 .../usergrid/ConcurrentServiceITSuite.java      |  60 -----
 .../org/apache/usergrid/NewOrgAppAdminRule.java | 159 +++++++++++
 .../org/apache/usergrid/ServiceITSuite.java     |  64 -----
 .../apache/usergrid/management/EmailFlowIT.java | 124 ++++++---
 .../usergrid/management/OrganizationIT.java     |  36 ++-
 .../org/apache/usergrid/management/RoleIT.java  |  12 +-
 .../cassandra/ApplicationCreatorIT.java         |  46 ++--
 .../management/cassandra/ExportServiceIT.java   |  63 +++--
 .../cassandra/ManagementServiceIT.java          |  94 ++++---
 .../security/providers/FacebookProviderIT.java  |  21 +-
 .../providers/PingIdentityProviderIT.java       |  12 +-
 .../security/tokens/TokenServiceIT.java         |  55 ++--
 .../usergrid/services/AbstractServiceIT.java    |  13 +-
 .../usergrid/services/ServiceFactoryIT.java     |   4 +-
 .../usergrid/services/ServiceRequestIT.java     |  14 +-
 .../java/org/apache/usergrid/TestHelper.java    |  75 ++++++
 33 files changed, 687 insertions(+), 924 deletions(-)
----------------------------------------------------------------------



Mime
View raw message