cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 19 Sep 2013 18:07:53 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: e5a7cede6c9bf06854941bb2e31343c66deb3e54
Parents: ec7a3e5 2336d94
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Sep 19 21:06:20 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Sep 19 21:06:20 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 src/java/org/apache/cassandra/cli/CliMain.java  | 28 +++++------------
 .../org/apache/cassandra/cli/CliOptions.java    | 15 +++++----
 .../apache/cassandra/cli/CliSessionState.java   |  6 ++--
 .../hadoop/AbstractColumnFamilyInputFormat.java | 11 ++++---
 .../AbstractColumnFamilyOutputFormat.java       |  2 +-
 .../apache/cassandra/hadoop/ConfigHelper.java   | 33 +++++++-------------
 .../cassandra/thrift/ITransportFactory.java     | 14 +++------
 .../thrift/TFramedTransportFactory.java         | 17 +++++-----
 9 files changed, 50 insertions(+), 77 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5a7cede/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 942063e,a25d03e..44c7f1b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,6 +1,14 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
  2.0.2
   * Make ThriftServer more easlly extensible (CASSANDRA-6058)
+  * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
  Merged from 1.2:
   * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
  


Mime
View raw message