cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/6] git commit: Merge branch 'cassandra-1.2' into trunk
Date Wed, 05 Dec 2012 03:46:14 GMT
Updated Branches:
  refs/heads/cassandra-1.2 07c6ff1b3 -> dfc7b2753
  refs/heads/cassandra-1.2.0 aaf9409f5 -> 8a96ec702
  refs/heads/trunk 387b10226 -> 513f0a065


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/513f0a06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/513f0a06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/513f0a06

Branch: refs/heads/trunk
Commit: 513f0a065311daaf4c47e18aa73bd926faf0cc80
Parents: 387b102 dfc7b27
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Dec 4 21:46:07 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Dec 4 21:46:07 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    4 +++
 conf/cassandra.yaml                                |   15 +++++------
 src/java/org/apache/cassandra/config/Config.java   |   10 +++---
 .../cassandra/config/DatabaseDescriptor.java       |   20 +++++++-------
 .../org/apache/cassandra/net/MessagingService.java |    2 +-
 5 files changed, 27 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


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

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

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

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


Mime
View raw message