You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/27 01:02:12 UTC
[15/15] 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/300f1a65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/300f1a65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/300f1a65
Branch: refs/heads/trunk
Commit: 300f1a65ceca3286fa8d530658cbcae59310cc12
Parents: b2930de 37c7d23
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 26 18:01:49 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 26 18:01:49 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
NEWS.txt | 9 +++++++++
.../org/apache/cassandra/config/Config.java | 2 ++
.../cassandra/config/DatabaseDescriptor.java | 20 ++++++++++++++++++++
.../cql3/statements/AlterTableStatement.java | 15 +++++++++++++++
src/java/org/apache/cassandra/db/Memtable.java | 17 ++++++++---------
.../db/compaction/CompactionManager.java | 12 +++++-------
.../org/apache/cassandra/utils/Allocator.java | 4 ++++
.../apache/cassandra/utils/HeapAllocator.java | 16 +++++++++++++++-
9 files changed, 82 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/300f1a65/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/300f1a65/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/300f1a65/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/300f1a65/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------