Updated Branches:
refs/heads/cassandra-1.1.0 9895c88de -> a4a83fc07
Merge branch 'cassandra-1.0' into cassandra-1.1.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/MigrationManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4a83fc0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4a83fc0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4a83fc0
Branch: refs/heads/cassandra-1.1.0
Commit: a4a83fc070eabbb441170383eec3963a3b6be884
Parents: 9895c88 5434ac4
Author: Sylvain Lebresne <[email protected]>
Authored: Tue Apr 17 18:13:39 2012 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Tue Apr 17 18:13:39 2012 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/HintedHandOffManager.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4a83fc0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
