cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From goffi...@apache.org
Subject [1/8] git commit: Merge branch 'cassandra-1.1' into trunk
Date Mon, 06 Feb 2012 04:15:12 GMT
Updated Branches:
  refs/heads/cassandra-1.1 e36b2130f -> 4f4aa4fb9
  refs/heads/trunk 76736edc6 -> 92813d9f0


Merge branch 'cassandra-1.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/92813d9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92813d9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92813d9f

Branch: refs/heads/trunk
Commit: 92813d9f08097a09b3ada9b46de06ec54b663914
Parents: 76736ed 4f4aa4f
Author: Chris Goffinet <cg@chrisgoffinet.com>
Authored: Sun Feb 5 20:14:46 2012 -0800
Committer: Chris Goffinet <cg@chrisgoffinet.com>
Committed: Sun Feb 5 20:14:46 2012 -0800

----------------------------------------------------------------------
 CHANGES.txt                                        |    3 ++-
 NEWS.txt                                           |    8 ++++++++
 conf/cassandra-env.sh                              |    1 +
 conf/cassandra.yaml                                |    7 +++++++
 src/java/org/apache/cassandra/config/Config.java   |    2 ++
 .../cassandra/config/DatabaseDescriptor.java       |    5 +++++
 .../cassandra/net/OutboundTcpConnection.java       |    5 +++++
 .../cassandra/net/OutboundTcpConnectionPool.java   |    2 +-
 .../apache/cassandra/streaming/FileStreamTask.java |    1 +
 .../cassandra/streaming/IncomingStreamReader.java  |    1 +
 10 files changed, 33 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92813d9f/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message