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 2013/12/02 22:51:21 UTC
[3/3] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/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/04b9497c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/04b9497c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/04b9497c
Branch: refs/heads/two-dot-o
Commit: 04b9497c96617d8fbde7c816c3e7868d1c454fac
Parents: f08f96c c5aadde
Author: Todd Nine <to...@apache.org>
Authored: Mon Dec 2 14:51:09 2013 -0700
Committer: Todd Nine <to...@apache.org>
Committed: Mon Dec 2 14:51:09 2013 -0700
----------------------------------------------------------------------
stack/corepersistence/perftest/pom.xml | 109 +++++++++--
.../org/apache/usergrid/perftest/CallStats.java | 117 +++++++++++
.../apache/usergrid/perftest/NoopPerftest.java | 6 +-
.../usergrid/perftest/PerftestModule.java | 7 +-
.../usergrid/perftest/PerftestRunner.java | 152 +++++++-------
.../usergrid/perftest/PerftestRunnerTest.java | 31 +++
.../apache/usergrid/perftest/ResultsLog.java | 51 +++++
.../usergrid/perftest/ResultsLogImpl.java | 133 +++++++++++++
.../perftest/amazon/AmazonS3Module.java | 15 ++
.../perftest/amazon/AmazonS3Service.java | 24 +++
.../perftest/amazon/AmazonS3ServiceImpl.java | 196 +++++++++++++++++++
.../apache/usergrid/perftest/logging/Log.java | 19 --
.../perftest/logging/Slf4jMembersInjector.java | 46 -----
.../perftest/logging/Slf4jTypeListener.java | 44 -----
.../usergrid/perfteststats/CallStats.java | 90 ---------
.../src/main/resources/config.properties | 11 +-
.../src/main/resources/log4j.properties | 18 +-
.../usergrid/perftest/ResultsLogImplTest.java | 82 ++++++++
.../perftest/amazon/AmazonS3ServiceTest.java | 39 ++++
.../src/test/resources/log4j-jetty.properties | 9 +
.../src/test/resources/log4j.properties | 9 +
21 files changed, 888 insertions(+), 320 deletions(-)
----------------------------------------------------------------------