You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/04/02 19:27:17 UTC
[5/44] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8a415ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8a415ab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8a415ab
Branch: refs/heads/trunk
Commit: c8a415ab347c88bfacf3deaaa5cc6167efc3c1d2
Parents: 457e09e 2462c6a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Apr 2 12:24:21 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Apr 2 12:24:21 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 10 ++++++-
conf/cassandra-env.sh | 2 +-
.../cassandra/net/IncomingTcpConnection.java | 21 +++++++--------
.../org/apache/cassandra/cli/CliHelp.yaml | 2 +-
4 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8a415ab/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8a415ab/src/resources/org/apache/cassandra/cli/CliHelp.yaml
----------------------------------------------------------------------