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/5570b9d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5570b9d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5570b9d3 Branch: refs/heads/es-client-changes Commit: 5570b9d37298942515c88b69a7ba124c6b1373d7 Parents: cb848d8 aba5121 Author: Dave Johnson <[email protected]> Authored: Thu Oct 30 15:29:25 2014 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Oct 30 15:29:25 2014 -0400 ---------------------------------------------------------------------- stack/loadtests/src/main/scripts/gatling-mvn.sh | 3 +++ .../src/test/resources/logback-test.xml | 22 ++++++++++++++++++++ 2 files changed, 25 insertions(+) ----------------------------------------------------------------------
