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-1.2' into trunk
Date Fri, 01 Feb 2013 12:00:14 GMT
Updated Branches:
  refs/heads/cassandra-1.2 aa90c88be -> 0d4923f24
  refs/heads/trunk f112f992b -> d52e12a86


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: d52e12a86bb600cd90254f4ebd80af27f4f63432
Parents: f112f99 0d4923f
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Feb 1 06:00:13 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Feb 1 06:00:13 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 conf/cassandra.yaml                                |    4 ++++
 src/java/org/apache/cassandra/config/Config.java   |    2 ++
 .../cassandra/config/DatabaseDescriptor.java       |   10 ++++++++++
 .../cassandra/net/IncomingTcpConnection.java       |   12 ++++++++++++
 .../cassandra/net/OutboundTcpConnection.java       |   12 ++++++++++++
 6 files changed, 41 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52e12a8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 004bd3e,43eb1f5..09df85e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,8 -5,8 +12,9 @@@
   * Validate login for USE queries (CASSANDRA-5207)
   * cli: remove default username and password (CASSANDRA-5208)
   * configure populate_io_cache_on_flush per-CF (CASSANDRA-4694)
+  * allow configuration of internode socket buffer (CASSANDRA-3378)
  
 +
  1.2.1
   * stream undelivered hints on decommission (CASSANDRA-5128)
   * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52e12a8/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52e12a8/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52e12a8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------


Mime
View raw message