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 22:55:05 UTC
[1/3] git commit: Add new stress deps to packaging. Patch by Michael
Shuler, reviewed by brandonwilliams for CASSANDRA-6762
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3f614ff4b -> 7bd23316e
refs/heads/trunk 97f31303b -> 4cd434f46
Add new stress deps to 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/7bd23316
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bd23316
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bd23316
Branch: refs/heads/cassandra-2.1
Commit: 7bd23316e9944cc78bef8ce6b05ea1ddbbe1a308
Parents: 3f614ff
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:51:25 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:51:25 2014 -0600
----------------------------------------------------------------------
build.xml | 3 +++
debian/rules | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bd23316/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7afe3bf..bb8673e 100644
--- a/build.xml
+++ b/build.xml
@@ -926,6 +926,9 @@
<fileset dir="${build.dir}/tools/lib/">
<include name="*.jar" />
</fileset>
+ <fileset dir="${build.tools.lib}">
+ <include name="*.jar" />
+ </fileset>
</copy>
<artifact:writepom pomRefId="dist-pom"
file="${build.dir}/${final.name}-dist.pom"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bd23316/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index c45bf3e..0a43a99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,9 @@ install: build
usr/share/cassandra
# Copy stress jars
- dh_install build/tools/lib/*.jar \
+ dh_install build/tools/lib/stress.jar \
+ usr/share/cassandra
+ dh_install 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/4cd434f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4cd434f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4cd434f4
Branch: refs/heads/trunk
Commit: 4cd434f465e99e552802e07687cc173b51db761f
Parents: 97f3130 7bd2331
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:52:13 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:52:13 2014 -0600
----------------------------------------------------------------------
build.xml | 3 +++
debian/rules | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cd434f4/build.xml
----------------------------------------------------------------------
[2/3] git commit: Add new stress deps to packaging. Patch by Michael
Shuler, reviewed by brandonwilliams for CASSANDRA-6762
Posted by br...@apache.org.
Add new stress deps to 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/7bd23316
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bd23316
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bd23316
Branch: refs/heads/trunk
Commit: 7bd23316e9944cc78bef8ce6b05ea1ddbbe1a308
Parents: 3f614ff
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 25 15:51:25 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 25 15:51:25 2014 -0600
----------------------------------------------------------------------
build.xml | 3 +++
debian/rules | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bd23316/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7afe3bf..bb8673e 100644
--- a/build.xml
+++ b/build.xml
@@ -926,6 +926,9 @@
<fileset dir="${build.dir}/tools/lib/">
<include name="*.jar" />
</fileset>
+ <fileset dir="${build.tools.lib}">
+ <include name="*.jar" />
+ </fileset>
</copy>
<artifact:writepom pomRefId="dist-pom"
file="${build.dir}/${final.name}-dist.pom"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bd23316/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index c45bf3e..0a43a99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,9 @@ install: build
usr/share/cassandra
# Copy stress jars
- dh_install build/tools/lib/*.jar \
+ dh_install build/tools/lib/stress.jar \
+ usr/share/cassandra
+ dh_install tools/lib/*.jar \
usr/share/cassandra
dh_link usr/share/cassandra/apache-cassandra-$(VERSION).jar \