usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [05/14] git commit: Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Date Tue, 04 Nov 2014 22:59:27 GMT
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o


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

Branch: refs/heads/key-row-sharding
Commit: 4ae64722453309df5b40f8e6af2bc3c24acaa4e2
Parents: dafb27e 960ce6b
Author: ryan bridges <rbridges@apigee.com>
Authored: Tue Oct 28 11:18:54 2014 -0400
Committer: ryan bridges <rbridges@apigee.com>
Committed: Tue Oct 28 11:18:54 2014 -0400

----------------------------------------------------------------------
 stack/loadtests/README.md                       |  52 -----
 stack/loadtests/gatling/LICENSE                 | 202 -------------------
 stack/loadtests/gatling/conf/application.conf   |  21 --
 stack/loadtests/gatling/conf/gatling.conf       | 162 ---------------
 stack/loadtests/gatling/conf/logback.xml        |  35 ----
 stack/loadtests/gatling/conf/recorder.conf      |  51 -----
 .../gatling/lib/Saxon-HE-9.5.1-6-compressed.jar | Bin 3813075 -> 0 bytes
 .../gatling/lib/akka-actor_2.10-2.3.6.jar       | Bin 2583959 -> 0 bytes
 .../lib/async-http-client-1.9.0-BETA13.jar      | Bin 579954 -> 0 bytes
 stack/loadtests/gatling/lib/boon-0.26.jar       | Bin 1026950 -> 0 bytes
 .../loadtests/gatling/lib/commons-pool-1.6.jar  | Bin 111119 -> 0 bytes
 .../lib/compiler-interface-0.13.5-sources.jar   | Bin 30056 -> 0 bytes
 .../lib/concurrentlinkedhashmap-lru-1.4.jar     | Bin 116575 -> 0 bytes
 stack/loadtests/gatling/lib/config-1.2.1.jar    | Bin 219554 -> 0 bytes
 .../gatling/lib/fastring_2.10-0.2.4.jar         | Bin 98640 -> 0 bytes
 .../gatling/lib/gatling-app-2.0.0-RC5.jar       | Bin 73052 -> 0 bytes
 .../gatling/lib/gatling-charts-2.0.0-RC5.jar    | Bin 500609 -> 0 bytes
 .../lib/gatling-charts-highcharts-2.0.0-RC5.jar | Bin 214683 -> 0 bytes
 .../gatling/lib/gatling-core-2.0.0-RC5.jar      | Bin 1678475 -> 0 bytes
 .../gatling/lib/gatling-http-2.0.0-RC5.jar      | Bin 1222752 -> 0 bytes
 .../gatling/lib/gatling-jdbc-2.0.0-RC5.jar      | Bin 41648 -> 0 bytes
 .../gatling/lib/gatling-jms-2.0.0-RC5.jar       | Bin 174279 -> 0 bytes
 .../gatling/lib/gatling-metrics-2.0.0-RC5.jar   | Bin 72446 -> 0 bytes
 .../gatling/lib/gatling-recorder-2.0.0-RC5.jar  | Bin 815471 -> 0 bytes
 .../gatling/lib/gatling-redis-2.0.0-RC5.jar     | Bin 19970 -> 0 bytes
 .../gatling/lib/geronimo-jms_1.1_spec-1.1.1.jar | Bin 32359 -> 0 bytes
 .../gatling/lib/incremental-compiler-0.13.5.jar | Bin 2214694 -> 0 bytes
 .../gatling/lib/jackson-annotations-2.4.0.jar   | Bin 38605 -> 0 bytes
 .../gatling/lib/jackson-core-2.4.2.jar          | Bin 225316 -> 0 bytes
 .../gatling/lib/jackson-databind-2.4.2.jar      | Bin 1075759 -> 0 bytes
 stack/loadtests/gatling/lib/jodd-core-3.6.jar   | Bin 373882 -> 0 bytes
 .../loadtests/gatling/lib/jodd-lagarto-3.6.jar  | Bin 204738 -> 0 bytes
 stack/loadtests/gatling/lib/jodd-log-3.6.jar    | Bin 14547 -> 0 bytes
 .../gatling/lib/jsonpath_2.10-0.5.0.jar         | Bin 180090 -> 0 bytes
 stack/loadtests/gatling/lib/jzlib-1.1.3.jar     | Bin 71976 -> 0 bytes
 .../gatling/lib/logback-classic-1.1.2.jar       | Bin 270750 -> 0 bytes
 .../gatling/lib/logback-core-1.1.2.jar          | Bin 427729 -> 0 bytes
 .../loadtests/gatling/lib/netty-3.9.4.Final.jar | Bin 1310154 -> 0 bytes
 stack/loadtests/gatling/lib/opencsv-2.3.jar     | Bin 19827 -> 0 bytes
 .../gatling/lib/redisclient_2.10-2.13.jar       | Bin 712616 -> 0 bytes
 .../gatling/lib/sbt-interface-0.13.5.jar        | Bin 52012 -> 0 bytes
 stack/loadtests/gatling/lib/scala-compiler.jar  | Bin 14445780 -> 0 bytes
 stack/loadtests/gatling/lib/scala-library.jar   | Bin 7126372 -> 0 bytes
 stack/loadtests/gatling/lib/scala-reflect.jar   | Bin 3203471 -> 0 bytes
 .../gatling/lib/scala-swing-2.10.4.jar          | Bin 707298 -> 0 bytes
 .../lib/scalalogging-slf4j_2.10-1.1.0.jar       | Bin 79003 -> 0 bytes
 .../loadtests/gatling/lib/scopt_2.10-3.2.0.jar  | Bin 122918 -> 0 bytes
 stack/loadtests/gatling/lib/slf4j-api-1.7.7.jar | Bin 29257 -> 0 bytes
 stack/loadtests/gatling/lib/t-digest-3.0.jar    | Bin 49754 -> 0 bytes
 stack/loadtests/gatling/lib/threetenbp-1.0.jar  | Bin 507797 -> 0 bytes
 .../gatling/lib/uncommons-maths-1.2.3.jar       | Bin 49923 -> 0 bytes
 stack/loadtests/gatling/lib/zinc-0.3.5.3.jar    | Bin 392810 -> 0 bytes
 stack/loadtests/gatling/scripts/gatling-ug.sh   |  49 -----
 .../gatling/user-files/data/search.csv          |   3 -
 .../gatling/user-files/request-bodies/.keep     |   0
 stack/loadtests/loadtest_setup.sh               |  45 -----
 stack/loadtests/pom.xml                         | 156 ++++++++++++++
 .../data-generators/EntityDataGenerator.scala   |  57 ------
 .../data-generators/FeederGenerator.scala       | 101 ----------
 .../scenarios/ApplicationScenarios.scala        |  45 -----
 .../scenarios/ConnectionScenarios.scala         |  30 ---
 .../usergrid/scenarios/DeviceScenarios.scala    |  65 ------
 .../usergrid/scenarios/GeoScenarios.scala       |  43 ----
 .../scenarios/NotificationScenarios.scala       |  71 -------
 .../usergrid/scenarios/NotifierScenarios.scala  |  65 ------
 .../scenarios/OrganizationScenarios.scala       |  42 ----
 .../usergrid/scenarios/TokenScenarios.scala     |  59 ------
 .../usergrid/scenarios/UserScenarios.scala      |  50 -----
 .../org/apache/usergrid/settings/Headers.scala  |  43 ----
 .../org/apache/usergrid/settings/Settings.scala |  54 -----
 .../org/apache/usergrid/settings/Utils.scala    |  87 --------
 .../simulations/GetEntitySimulation.scala       |  41 ----
 .../simulations/PostDevicesSimulation.scala     |  42 ----
 .../simulations/PostUsersSimulation.scala       |  47 -----
 .../PushTargetDeviceSimulation.scala            |  53 -----
 .../simulations/PushTargetUserSimulation.scala  |  68 -------
 .../datagenerators/EntityDataGenerator.scala    |  59 ++++++
 .../datagenerators/FeederGenerator.scala        | 114 +++++++++++
 .../scenarios/ApplicationScenarios.scala        |  46 +++++
 .../scenarios/ConnectionScenarios.scala         |  36 ++++
 .../usergrid/scenarios/DeviceScenarios.scala    |  85 ++++++++
 .../usergrid/scenarios/GeoScenarios.scala       |  44 ++++
 .../scenarios/NotificationScenarios.scala       |  74 +++++++
 .../usergrid/scenarios/NotifierScenarios.scala  |  66 ++++++
 .../scenarios/OrganizationScenarios.scala       |  43 ++++
 .../usergrid/scenarios/TokenScenarios.scala     |  60 ++++++
 .../usergrid/scenarios/UserScenarios.scala      |  50 +++++
 .../org/apache/usergrid/settings/Headers.scala  |  43 ++++
 .../org/apache/usergrid/settings/Settings.scala |  50 +++++
 .../org/apache/usergrid/settings/Utils.scala    |  91 +++++++++
 .../simulations/GetEntitySimulation.scala       |  44 ++++
 .../simulations/PostDevicesSimulation.scala     |  45 +++++
 .../simulations/PostUsersSimulation.scala       |  50 +++++
 ...PushNotificationTargetDeviceSimulation.scala |  57 ++++++
 .../PushNotificationTargetUserSimulation.scala  |  72 +++++++
 stack/loadtests/src/main/scripts/gatling-ug.sh  |  51 +++++
 stack/loadtests/src/test/resources/gatling.conf | 154 ++++++++++++++
 stack/loadtests/src/test/resources/logback.xml  |  37 ++++
 .../loadtests/src/test/resources/recorder.conf  |  37 ++++
 stack/loadtests/src/test/scala/Engine.scala     |  32 +++
 .../src/test/scala/IDEPathHelper.scala          |  37 ++++
 stack/loadtests/src/test/scala/Recorder.scala   |  28 +++
 102 files changed, 1661 insertions(+), 1683 deletions(-)
----------------------------------------------------------------------



Mime
View raw message