You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/04/17 18:14:01 UTC

[1/4] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1.0

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 <sy...@datastax.com>
Authored: Tue Apr 17 18:13:39 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
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
----------------------------------------------------------------------