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 2014/02/05 01:36:39 UTC

[8/8] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d4f7c91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d4f7c91
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d4f7c91

Branch: refs/heads/trunk
Commit: 9d4f7c918d056afc038dcc94836e982e8b34a4f3
Parents: c947c12 93bd89f
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 4 18:34:16 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 4 18:34:16 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../cassandra/service/MigrationManager.java     | 33 +++-----------------
 .../cassandra/service/StorageService.java       |  7 ++---
 3 files changed, 9 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d4f7c91/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d4f7c91/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------