cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/4] git commit: Merge branch 'cassandra-1.2' into trunk
Date Mon, 12 Nov 2012 21:06:29 GMT
Updated Branches:
  refs/heads/cassandra-1.2 93f8fec9d -> 38bfc6dca
  refs/heads/cassandra-1.2.0 93f8fec9d -> 38bfc6dca
  refs/heads/trunk d104ca636 -> 0353330ab


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/0353330a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0353330a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0353330a

Branch: refs/heads/trunk
Commit: 0353330ab0d3ce1cf0f982aa2da21a6775031c41
Parents: d104ca6 38bfc6d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Nov 12 15:06:21 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Nov 12 15:06:21 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/config/CFMetaData.java    |    3 +-
 .../apache/cassandra/cql3/UntypedResultSet.java    |    9 ++-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   97 ++++-----------
 src/java/org/apache/cassandra/db/SystemTable.java  |   64 ++++++++++
 .../cassandra/db/commitlog/CommitLogReplayer.java  |   21 ++--
 .../cassandra/db/compaction/CompactionManager.java |    5 +-
 7 files changed, 118 insertions(+), 82 deletions(-)
----------------------------------------------------------------------



Mime
View raw message