cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.1' into trunk
Date Mon, 21 May 2012 20:58:09 GMT
Updated Branches:
  refs/heads/trunk 3fd08ddfb -> ac362dadd


Merge branch 'cassandra-1.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/ac362dad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac362dad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac362dad

Branch: refs/heads/trunk
Commit: ac362dadd340bd53e4844bec737711a0c2ea3e80
Parents: 3fd08dd 0267293
Author: Vijay Parthasarathy <vijay2win@gmail.com>
Authored: Mon May 21 13:57:21 2012 -0700
Committer: Vijay Parthasarathy <vijay2win@gmail.com>
Committed: Mon May 21 13:57:21 2012 -0700

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 debian/cassandra.install                           |    1 +
 debian/rules                                       |    4 +
 lib/concurrentlinkedhashmap-lru-1.2.jar            |  Bin 53011 -> 0 bytes
 lib/concurrentlinkedhashmap-lru-1.3.jar            |  Bin 0 -> 54345 bytes
 .../cassandra/cache/ConcurrentLinkedHashCache.java |   10 +-
 .../cache/ConcurrentLinkedHashCacheProvider.java   |    2 +-
 src/java/org/apache/cassandra/cache/ICache.java    |    6 +-
 .../apache/cassandra/cache/IRowCacheProvider.java  |    2 +-
 .../apache/cassandra/cache/InstrumentingCache.java |    8 +-
 .../apache/cassandra/cache/SerializingCache.java   |    8 +-
 .../cassandra/cache/SerializingCacheProvider.java  |    2 +-
 src/java/org/apache/cassandra/config/Config.java   |    4 +-
 .../cassandra/config/DatabaseDescriptor.java       |    6 +-
 .../org/apache/cassandra/service/CacheService.java |   20 ++--
 .../cassandra/service/CacheServiceMBean.java       |   16 ++--
 .../apache/cassandra/cache/CacheProviderTest.java  |    2 +-
 tools/bin/cassandra-stress                         |   44 ++++++++
 tools/bin/cassandra-stress.bat                     |   31 ++++++
 tools/bin/cassandra-stressd                        |   84 +++++++++++++++
 tools/bin/cassandra.in.sh                          |   42 +++++++
 tools/bin/stress                                   |   48 --------
 tools/bin/stress.bat                               |   31 ------
 tools/bin/stressd                                  |   84 ---------------
 tools/stress/README.txt                            |   14 ++--
 .../src/org/apache/cassandra/stress/Stress.java    |    2 +-
 26 files changed, 258 insertions(+), 214 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/cache/ICache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/cache/IRowCacheProvider.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/cache/InstrumentingCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/cache/SerializingCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java
----------------------------------------------------------------------

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/src/java/org/apache/cassandra/service/CacheServiceMBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac362dad/test/unit/org/apache/cassandra/cache/CacheProviderTest.java
----------------------------------------------------------------------


Mime
View raw message