Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82504a0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82504a0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82504a0e Branch: refs/heads/master Commit: 82504a0e5434051af08628afdf1d95283fdb4f49 Parents: a7965c7 ee8ac73 Author: vozerov-gridgain <[email protected]> Authored: Fri Aug 5 10:31:56 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Aug 5 10:31:56 2016 +0300 ---------------------------------------------------------------------- modules/cassandra/pom.xml | 24 +- .../cassandra/src/test/bootstrap/aws/README.txt | 13 + .../aws/cassandra/cassandra-bootstrap.sh | 449 +++--- .../bootstrap/aws/cassandra/cassandra-env.sh | 4 + .../bootstrap/aws/cassandra/cassandra-start.sh | 483 +----- .../aws/cassandra/cassandra-template.yaml | 9 +- .../cassandra/src/test/bootstrap/aws/common.sh | 1481 ++++++++++++++++++ modules/cassandra/src/test/bootstrap/aws/env.sh | 113 ++ .../test/bootstrap/aws/ganglia/agent-start.sh | 75 + .../bootstrap/aws/ganglia/ganglia-bootstrap.sh | 417 +++++ .../bootstrap/aws/ignite/ignite-bootstrap.sh | 456 +++--- .../ignite/ignite-cassandra-server-template.xml | 27 +- .../src/test/bootstrap/aws/ignite/ignite-env.sh | 6 +- .../test/bootstrap/aws/ignite/ignite-start.sh | 537 +------ .../src/test/bootstrap/aws/logs-collector.sh | 179 ++- .../tests/ignite-cassandra-client-template.xml | 21 +- .../test/bootstrap/aws/tests/tests-bootstrap.sh | 448 +++--- .../test/bootstrap/aws/tests/tests-manager.sh | 458 ++++++ .../test/bootstrap/aws/tests/tests-report.sh | 189 +-- .../src/test/bootstrap/aws/tests/tests-run.sh | 715 --------- .../LoadTestsCassandraArtifactsCreator.java | 104 ++ .../tests/cassandra/connection-settings.xml | 6 +- .../tests/persistence/blob/ignite-config.xml | 6 - .../tests/persistence/pojo/ignite-config.xml | 6 - .../persistence/primitive/ignite-config.xml | 6 - .../primitive/ignite-remote-client-config.xml | 6 +- .../primitive/ignite-remote-server-config.xml | 6 +- .../scripts/recreate-cassandra-artifacts.bat | 39 + .../scripts/recreate-cassandra-artifacts.sh | 39 + 29 files changed, 3756 insertions(+), 2566 deletions(-) ----------------------------------------------------------------------
