Repository: cassandra Updated Branches: refs/heads/trunk 05eac99d3 -> 2f25e6e6e
Include stress yaml examples in release and deb patch by tjake and mshuler; reviewed by mshuler and slebresne for CASSANDRA-7717 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a932b62e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a932b62e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a932b62e Branch: refs/heads/trunk Commit: a932b62eae816f2de6c53c8a48d23202bc8717e4 Parents: 6ba4e72 Author: Sylvain Lebresne <[email protected]> Authored: Fri Aug 8 12:49:25 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Aug 8 12:49:25 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 5 +++++ debian/rules | 1 + 3 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a932b62e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index aef0c40..9ebb8cd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.0-final + * Include stress yaml example in release and deb (CASSANDRA-7717) * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) * Fix binding null values inside UDT (CASSANDRA-7685) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a932b62e/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index f1014fb..18fa1ec 100644 --- a/build.xml +++ b/build.xml @@ -941,6 +941,11 @@ <copy todir="${dist.dir}/tools/bin"> <fileset dir="${basedir}/tools/bin"/> </copy> + <copy todir="${dist.dir}/tools/"> + <fileset dir="${basedir}/tools/"> + <include name="*.yaml"/> + </fileset> + </copy> <copy todir="${dist.dir}/tools/lib"> <fileset dir="${build.dir}/tools/lib/"> <include name="*.jar" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/a932b62e/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index 602cfde..ca303f1 100755 --- a/debian/rules +++ b/debian/rules @@ -65,6 +65,7 @@ binary-indep: build install dh_installchangelogs dh_installinit -u'start 50 2 3 4 5 . stop 50 0 1 6 .' dh_installdocs README.asc CHANGES.txt NEWS.txt + dh_installexamples tools/*.yaml dh_bash-completion dh_compress dh_fixperms
