You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/08/08 12:51:20 UTC
[1/3] git commit: Include stress yaml examples in release and deb
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 <sy...@datastax.com>
Authored: Fri Aug 8 12:49:25 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
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
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8aed4196
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8aed4196
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8aed4196
Branch: refs/heads/trunk
Commit: 8aed4196d2f23f5c1207a92d23f47aa5868b9015
Parents: fcb79b7 a932b62
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Aug 8 12:50:44 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Aug 8 12:50:44 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/8aed4196/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2bd8667,9ebb8cd..0398235
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
+2.1.1
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
+
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/8aed4196/build.xml
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@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/2f25e6e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f25e6e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f25e6e6
Branch: refs/heads/trunk
Commit: 2f25e6e6ea1b1f428873eb964dfc8df401d2bb2d
Parents: 05eac99 8aed419
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Aug 8 12:51:12 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Aug 8 12:51:12 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/2f25e6e6/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f25e6e6/build.xml
----------------------------------------------------------------------