Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2a463a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2a463a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2a463a6 Branch: refs/heads/trunk Commit: a2a463a66878cd62ecd0ea096b07f806d99f7548 Parents: eeef406 b7ac8f9 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Mar 31 13:11:00 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Mar 31 13:11:00 2014 +0300 ---------------------------------------------------------------------- NEWS.txt | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 3 +- .../apache/cassandra/db/BatchlogManager.java | 48 ++++++++---------- .../apache/cassandra/net/MessagingService.java | 6 +-- .../apache/cassandra/service/StorageProxy.java | 51 ++++++++++++-------- .../cassandra/db/BatchlogManagerTest.java | 7 ++- 6 files changed, 62 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2a463a6/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2a463a6/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2a463a6/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
