cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/44] git commit: merge from 1.1
Date Mon, 02 Apr 2012 17:27:17 GMT
Updated Branches:
  refs/heads/cassandra-0.8 51482ba22 -> c5e242819
  refs/heads/cassandra-1.0 4457839b9 -> 6be70090f
  refs/heads/cassandra-1.1 457e09e91 -> 1b79d8155
  refs/heads/cassandra-1.1.0 ef50e8f12 -> 2462c6a2a
  refs/heads/trunk 772c4f1a7 -> 47112b1e5


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 47112b1e59b5fcc9c50b6730ca73ec7c7c4e40c4
Parents: 772c4f1 1b79d81
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Apr 2 12:26:58 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Apr 2 12:26:58 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |   14 ++++++++++++--
 conf/cassandra-env.sh                              |    2 +-
 src/java/org/apache/cassandra/cli/CliClient.java   |    8 +++++++-
 .../cassandra/net/IncomingTcpConnection.java       |    3 ++-
 .../org/apache/cassandra/cli/CliHelp.yaml          |    2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/47112b1e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6c2db98,b90c53d..b61e211
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +1.2-dev
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 +
 +
  1.1.1-dev
+  * add column limit to cli (CASSANDRA-3012, 4098)
   * clean up and optimize DataOutputBuffer, used by CQL compression and
     CompositeType (CASSANDRA-4072)
   * optimize commitlog checksumming (CASSANDRA-3610)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/47112b1e/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/47112b1e/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------


Mime
View raw message