Merge commit 'refs/pull/500/head' of github.com:apache/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6b9e5efe Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6b9e5efe Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6b9e5efe Branch: refs/heads/asf-site Commit: 6b9e5efe05a57cca90b4daff35917528c5417646 Parents: 5a508c6 44bcbc4 Author: Michael Russo <mru...@apigee.com> Authored: Tue Apr 12 00:26:22 2016 +0200 Committer: Michael Russo <mru...@apigee.com> Committed: Tue Apr 12 00:26:22 2016 +0200 ---------------------------------------------------------------------- tests/performance/runLoadNestedEntities.sh | 98 ++++++++++++++++++++ .../datagenerators/EntityDataGenerator.scala | 40 ++++++++ .../org/apache/usergrid/enums/EntityType.scala | 3 +- 3 files changed, 140 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
