cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 29 May 2014 15:37:59 GMT
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/cfc37519
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfc37519
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfc37519

Branch: refs/heads/trunk
Commit: cfc37519e3226e6bb4e2266501488dace0746a37
Parents: 47c3dbd e4090f1
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu May 29 10:26:06 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu May 29 10:26:06 2014 -0500

----------------------------------------------------------------------
 .gitignore                     |  3 +-
 CHANGES.txt                    |  1 +
 bin/json2sstable               | 50 ---------------------------
 bin/json2sstable.bat           | 67 -------------------------------------
 bin/sstable2json               | 51 ----------------------------
 bin/sstable2json.bat           | 67 -------------------------------------
 bin/sstablesplit               | 50 ---------------------------
 bin/sstablesplit.bat           | 61 ---------------------------------
 debian/README.Debian           |  7 ++--
 debian/cassandra-tools.install |  7 ++++
 debian/cassandra.install       |  6 ----
 debian/control                 |  9 +++++
 tools/bin/cassandra.in.sh      | 22 ++++++------
 tools/bin/json2sstable         | 50 +++++++++++++++++++++++++++
 tools/bin/json2sstable.bat     | 67 +++++++++++++++++++++++++++++++++++++
 tools/bin/sstable2json         | 51 ++++++++++++++++++++++++++++
 tools/bin/sstable2json.bat     | 67 +++++++++++++++++++++++++++++++++++++
 tools/bin/sstablesplit         | 50 +++++++++++++++++++++++++++
 tools/bin/sstablesplit.bat     | 61 +++++++++++++++++++++++++++++++++
 19 files changed, 380 insertions(+), 367 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc37519/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b6bd8cc,cb745d9..fd48d20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +3.0
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Make incremental repair default (CASSANDRA-7250)
 +
  2.1.0-rc1
+  * Move less common tools into a new cassandra-tools package (CASSANDRA-7160)
   * Support more concurrent requests in native protocol (CASSANDRA-7231)
   * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
   * Change concurrent_compactors defaults (CASSANDRA-7139)


Mime
View raw message