Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6213cc89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6213cc89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6213cc89 Branch: refs/heads/trunk Commit: 6213cc89c94c9df1c480f541a194da0fe0edb6f6 Parents: 37a6792 5fe46e1 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Aug 22 04:36:25 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Aug 22 04:36:25 2013 +0300 ---------------------------------------------------------------------- NEWS.txt | 3 ++ interface/cassandra.thrift | 30 +++++++++++++------- .../cassandra/thrift/CassandraServer.java | 16 +++++++++++ 3 files changed, 39 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
