cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Date Mon, 04 Mar 2013 19:36:33 GMT
Updated Branches:
  refs/heads/cassandra-1.2 b7e10828f -> 6415d6bee
  refs/heads/trunk 6d5e0831a -> 881429ff8


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 881429ff8927a0ed6009542d6d03f07b19b76318
Parents: 6d5e083 6415d6b
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Mar 4 13:36:08 2013 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Mar 4 13:36:08 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 ++
 .../db/compaction/CompactionController.java        |   12 ++++++++++--
 .../transport/messages/ResultMessage.java          |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/881429ff/src/java/org/apache/cassandra/db/compaction/CompactionController.java
----------------------------------------------------------------------


Mime
View raw message