Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1176d9f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1176d9f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1176d9f3
Branch: refs/heads/cassandra-1.0
Commit: 1176d9f3a64b8ead82c0951b027517f25a1d638f
Parents: 6c70b83 d9ed037
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Feb 8 17:43:43 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Feb 8 17:43:43 2012 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
src/java/org/apache/cassandra/db/Table.java | 2 +-
.../apache/cassandra/service/StorageService.java | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1176d9f3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1176d9f3/src/java/org/apache/cassandra/db/Table.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1176d9f3/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
|