You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/12/08 00:34:05 UTC
[7/11] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32fe754d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32fe754d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32fe754d
Branch: refs/heads/cassandra-1.2
Commit: 32fe754dbed1784122509d7475584050443e47e8
Parents: cf3cde3 904caea
Author: Brandon Williams <br...@apache.org>
Authored: Fri Dec 7 17:26:04 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Dec 7 17:26:04 2012 -0600
----------------------------------------------------------------------
.../apache/cassandra/service/MigrationManager.java | 13 ++++++++++---
.../apache/cassandra/service/StorageService.java | 6 ++----
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------