cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [14/15] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Fri, 01 Aug 2014 15:49:23 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: dfa6b980229297fe9c1ac161189d29a32b3e3d64
Parents: 8b5990a 080aa94
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Aug 1 10:47:50 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Aug 1 10:47:50 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     | 13 +++++++
 .../cassandra/config/DatabaseDescriptor.java    |  2 +-
 .../cassandra/locator/SimpleSeedProvider.java   | 36 ++++++++++++--------
 3 files changed, 35 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


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

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


Mime
View raw message