cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [12/15] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1.0
Date Wed, 18 Apr 2012 18:26:51 GMT
Merge branch 'cassandra-1.0' into cassandra-1.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf98153c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf98153c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf98153c

Branch: refs/heads/cassandra-1.1
Commit: cf98153c6512c01358aafa7d4b04566d2438efbf
Parents: 03d3833 8c9d0fb
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Apr 18 11:13:11 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Apr 18 11:13:11 2012 -0500

----------------------------------------------------------------------
 build.xml                   |   48 +--------------------
 tools/bin/stress            |   48 ---------------------
 tools/bin/stress.bat        |   31 -------------
 tools/bin/stressd           |   84 ------------------------------------
 tools/stress/bin/stress     |   51 ++++++++++++++++++++++
 tools/stress/bin/stress.bat |   33 ++++++++++++++
 tools/stress/bin/stressd    |   87 ++++++++++++++++++++++++++++++++++++++
 tools/stress/build.xml      |   70 ++++++++++++++++++++++++++++++
 8 files changed, 243 insertions(+), 209 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf98153c/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf98153c/tools/stress/bin/stress.bat
----------------------------------------------------------------------
diff --cc tools/stress/bin/stress.bat
index 0000000,f7b0421..f7b0421
mode 000000,100644..100755
--- a/tools/stress/bin/stress.bat
+++ b/tools/stress/bin/stress.bat


Mime
View raw message