You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2014/10/22 23:12:18 UTC
[76/82] [abbrv] git commit: Merge branch 'loadtest' into two-dot-o
Merge branch 'loadtest' 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/2b636a13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2b636a13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2b636a13
Branch: refs/heads/two-dot-o-events
Commit: 2b636a136f87c95f6cbad4aa2863f56c5c426f7d
Parents: 6079d99 eb2624c
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 22 10:25:59 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 22 10:25:59 2014 -0600
----------------------------------------------------------------------
stack/loadtests/gatling/conf/application.conf | 14 ++++++++++++++
stack/loadtests/gatling/conf/gatling.conf | 14 ++++++++++++++
stack/loadtests/gatling/conf/logback.xml | 18 +++++++++++++++++-
stack/loadtests/gatling/conf/recorder.conf | 14 ++++++++++++++
stack/loadtests/gatling/scripts/gatling-ug.sh | 2 --
stack/loadtests/loadtest_setup.sh | 15 +++++++++++++++
.../data-generators/EntityDataGenerator.scala | 2 +-
.../data-generators/FeederGenerator.scala | 2 +-
.../usergrid/scenarios/ApplicationScenarios.scala | 2 +-
.../usergrid/scenarios/ConnectionScenarios.scala | 2 +-
.../usergrid/scenarios/DeviceScenarios.scala | 2 +-
.../apache/usergrid/scenarios/GeoScenarios.scala | 2 +-
.../scenarios/NotificationScenarios.scala | 2 +-
.../usergrid/scenarios/NotifierScenarios.scala | 2 +-
.../scenarios/OrganizationScenarios.scala | 2 +-
.../usergrid/scenarios/TokenScenarios.scala | 2 +-
.../apache/usergrid/scenarios/UserScenarios.scala | 2 +-
.../org/apache/usergrid/settings/Headers.scala | 2 +-
.../org/apache/usergrid/settings/Settings.scala | 2 +-
.../org/apache/usergrid/settings/Utils.scala | 2 +-
.../simulations/GetEntitySimulation.scala | 3 +--
.../simulations/PostDevicesSimulation.scala | 2 +-
.../simulations/PostUsersSimulation.scala | 2 +-
.../simulations/PushTargetDeviceSimulation.scala | 2 +-
.../simulations/PushTargetUserSimulation.scala | 2 +-
stack/pom.xml | 2 ++
26 files changed, 95 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2b636a13/stack/loadtests/gatling/conf/logback.xml
----------------------------------------------------------------------
diff --cc stack/loadtests/gatling/conf/logback.xml
index f859ad3,d9e4b1b..3b87362
--- a/stack/loadtests/gatling/conf/logback.xml
+++ b/stack/loadtests/gatling/conf/logback.xml
@@@ -1,21 -1,22 +1,37 @@@
- <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+ <?xml version="1.0" encoding="UTF-8"?>
<configuration>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2b636a13/stack/pom.xml
----------------------------------------------------------------------