You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/06/03 05:37:52 UTC
[1/3] git commit: remove incorrect use of generics in non-generified
method call
Repository: cassandra
Updated Branches:
refs/heads/trunk d66022392 -> 616c019ae
remove incorrect use of generics in non-generified method call
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62d9c436
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62d9c436
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62d9c436
Branch: refs/heads/trunk
Commit: 62d9c43676c5bf33d145e4d55d25ebd9bcf1caf7
Parents: 709b9fc
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 2 23:36:21 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 2 23:36:21 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/FileCacheService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/62d9c436/src/java/org/apache/cassandra/service/FileCacheService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/FileCacheService.java b/src/java/org/apache/cassandra/service/FileCacheService.java
index d22763b..faa53f0 100644
--- a/src/java/org/apache/cassandra/service/FileCacheService.java
+++ b/src/java/org/apache/cassandra/service/FileCacheService.java
@@ -77,7 +77,7 @@ public class FileCacheService
}
};
- cache = CacheBuilder.<String, Queue<RandomAccessReader>>newBuilder()
+ cache = CacheBuilder.newBuilder()
.expireAfterAccess(AFTER_ACCESS_EXPIRATION, TimeUnit.MILLISECONDS)
.concurrencyLevel(DatabaseDescriptor.getConcurrentReaders())
.removalListener(onRemove)
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.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/616c019a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/616c019a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/616c019a
Branch: refs/heads/trunk
Commit: 616c019aea3d24ed21fcb48290cf79b7d4f60106
Parents: d660223 a899512
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 2 23:37:28 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 2 23:37:28 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/FileCacheService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.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/a8995128
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8995128
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8995128
Branch: refs/heads/trunk
Commit: a8995128374a077172eb8c57094da68ee9ff0366
Parents: e398c6b 62d9c43
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 2 23:36:55 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 2 23:36:55 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/FileCacheService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8995128/src/java/org/apache/cassandra/service/FileCacheService.java
----------------------------------------------------------------------