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/04 14:15:19 UTC

[1/3] git commit: Fix changelog

Repository: cassandra
Updated Branches:
  refs/heads/trunk d6f3cdf6f -> c770256a7


Fix changelog


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

Branch: refs/heads/trunk
Commit: 520de135f7ef14172c8b64883c8392940dddc56b
Parents: 57abab1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 4 14:14:23 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 4 14:14:23 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/520de135/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index eaa3b43..0927a30 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.0-final
+
+2.1.0-rc5
  * Reject counters inside user types (CASSANDRA-7672)
  * Switch to notification-based GCInspector (CASSANDRA-7638)
  * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)


[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/f302eb78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f302eb78
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f302eb78

Branch: refs/heads/trunk
Commit: f302eb78445119372770e54dfd32837aa3c0912a
Parents: 8d06dd1 520de13
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 4 14:14:49 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 4 14:14:49 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f302eb78/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 24d3d50,0927a30..e2cc92b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,20 @@@
 +2.1.1
 + * 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:
 + * (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
+ 
+ 2.1.0-rc5
   * Reject counters inside user types (CASSANDRA-7672)
   * Switch to notification-based GCInspector (CASSANDRA-7638)
   * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)


[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/c770256a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c770256a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c770256a

Branch: refs/heads/trunk
Commit: c770256a7928448b2257f419917d51e905129d3d
Parents: d6f3cdf f302eb7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 4 14:15:08 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 4 14:15:08 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c770256a/CHANGES.txt
----------------------------------------------------------------------