cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: fix changes
Date Wed, 13 Aug 2014 19:25:44 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e00bb4a2a -> 50fc8ba0c
  refs/heads/trunk 9b4c4ef65 -> 5aaa4a027


fix changes


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

Branch: refs/heads/cassandra-2.1
Commit: 50fc8ba0c5a8caa9f8d14633734547187896d217
Parents: e00bb4a
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Aug 13 14:25:17 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Aug 13 14:25:17 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50fc8ba0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index de93018..f34cec7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,4 @@
 2.1.1
- * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
  * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
  * SSTableExport uses correct validator to create string representation of partition
    keys (CASSANDRA-7498)
@@ -13,6 +12,7 @@
  * Configurable client timeout for cqlsh (CASSANDRA-7516)
  * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 Merged from 2.0:
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
  * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
  * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
  * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)


Mime
View raw message