cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 02 Apr 2014 19:19:54 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 90387f63bc908b5ed91b47ee33454e85a98886de
Parents: 5b85be0 8234bc1
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Apr 2 14:16:07 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Apr 2 14:16:07 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../apache/cassandra/net/MessagingService.java  | 13 +-----
 .../org/apache/cassandra/utils/ExpiringMap.java | 47 +++++---------------
 .../apache/cassandra/service/RemoveTest.java    |  1 -
 4 files changed, 16 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90387f63/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------


Mime
View raw message