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/11/03 22:30:56 UTC

[4/4] git commit: Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding

Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding


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

Branch: refs/heads/key-row-sharding
Commit: c9c627bb30a6ab525c1bde2dd925325846938c3c
Parents: 47f7607 24ac268
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Nov 3 14:30:47 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Nov 3 14:30:47 2014 -0700

----------------------------------------------------------------------
 .../scenarios/ApplicationScenarios.scala        |  6 ++
 .../scenarios/NotificationScenarios.scala       | 23 +++++++-
 .../scenarios/OrganizationScenarios.scala       | 35 +++++++-----
 .../usergrid/scenarios/TokenScenarios.scala     | 17 +++++-
 .../usergrid/scenarios/UserScenarios.scala      |  8 +--
 .../org/apache/usergrid/settings/Settings.scala |  2 +
 ...PushNotificationTargetDeviceSimulation.scala | 57 -------------------
 .../PushNotificationTargetUserSimulation.scala  | 58 +++-----------------
 .../services/users/devices/DevicesService.java  |  4 +-
 9 files changed, 80 insertions(+), 130 deletions(-)
----------------------------------------------------------------------