Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e366e3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e366e3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e366e3b Branch: refs/heads/trunk Commit: 6e366e3b260615df05eea8bc5533f719df8343fe Parents: 350657c dd276eb Author: Jonathan Ellis <[email protected]> Authored: Wed Mar 19 12:11:59 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Mar 19 12:11:59 2014 -0500 ---------------------------------------------------------------------- interface/cassandra.thrift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e366e3b/interface/cassandra.thrift ----------------------------------------------------------------------
