You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/09/08 23:06:16 UTC
[13/50] usergrid git commit: Merge remote-tracking branch
'github/pr/369' into two-dot-o-dev
Merge remote-tracking branch 'github/pr/369' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/af944cf8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/af944cf8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/af944cf8
Branch: refs/heads/usergrid-103-upgrade-jersey
Commit: af944cf816c85c0bc75b41cfcd53f86d81a25bd9
Parents: a9e54d3 245fb7e
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Aug 31 14:23:17 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Aug 31 14:23:17 2015 -0600
----------------------------------------------------------------------
stack/loadtests/README.md | 10 +-
stack/loadtests/runOrgAppSetup.sh | 88 ++++++++++++
stack/loadtests/runRandomEntityByNameTest.sh | 4 +-
stack/loadtests/runRandomEntityByUuidTest.sh | 6 +-
.../usergrid/enums/ConfigProperties.scala | 8 +-
.../apache/usergrid/enums/ScenarioType.scala | 3 +-
.../scenarios/EntityCollectionScenarios.scala | 6 +
.../org/apache/usergrid/settings/Settings.scala | 22 +++
.../simulations/ConfigurableSimulation.scala | 1 +
stack/loadtests/testConfig.sh | 1 +
stack/pom.xml | 1 +
.../usergrid/rest/CollectionMetadataIT.java | 142 +++++++++++++++++++
.../test/resource/endpoints/NamedResource.java | 6 +-
.../test/resource/model/QueryParameters.java | 8 ++
14 files changed, 293 insertions(+), 13 deletions(-)
----------------------------------------------------------------------