You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/02/25 17:48:01 UTC

[1/3] git commit: Add stress and deps to debian packaging. Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6762

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 85f67aa9c -> bdd24ccc8
  refs/heads/trunk d697ba6f5 -> f48adab37


Add stress and deps to debian packaging.
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6762


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

Branch: refs/heads/cassandra-2.1
Commit: bdd24ccc8672d71b7495343ef379dd50bc31e02a
Parents: 85f67aa
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 10:44:27 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 10:44:27 2014 -0600

----------------------------------------------------------------------
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdd24ccc/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 11b78e7..c45bf3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,8 @@ install: build
 	dh_install build/apache-cassandra-thrift-$(VERSION).jar \
 		usr/share/cassandra
 
-	# Copy stress jar
-	dh_install build/tools/lib/stress.jar \
+	# Copy stress jars
+	dh_install build/tools/lib/*.jar \
 		usr/share/cassandra
 
 	dh_link usr/share/cassandra/apache-cassandra-$(VERSION).jar \


[2/3] git commit: Add stress and deps to debian packaging. Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6762

Posted by br...@apache.org.
Add stress and deps to debian packaging.
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6762


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

Branch: refs/heads/trunk
Commit: bdd24ccc8672d71b7495343ef379dd50bc31e02a
Parents: 85f67aa
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 10:44:27 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 10:44:27 2014 -0600

----------------------------------------------------------------------
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdd24ccc/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 11b78e7..c45bf3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,8 @@ install: build
 	dh_install build/apache-cassandra-thrift-$(VERSION).jar \
 		usr/share/cassandra
 
-	# Copy stress jar
-	dh_install build/tools/lib/stress.jar \
+	# Copy stress jars
+	dh_install build/tools/lib/*.jar \
 		usr/share/cassandra
 
 	dh_link usr/share/cassandra/apache-cassandra-$(VERSION).jar \


[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f48adab37101737d8ea76365feca82b599be414e
Parents: d697ba6 bdd24cc
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 10:45:09 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 10:45:09 2014 -0600

----------------------------------------------------------------------
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------