Merge branch 'cassandra-1.2' 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/dd276ebb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd276ebb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd276ebb Branch: refs/heads/trunk Commit: dd276ebb5dc96fbc487c4cde1ff8b5f9d3a019a4 Parents: c80f61b 73a3eeb Author: Jonathan Ellis <[email protected]> Authored: Wed Mar 19 12:11:02 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Mar 19 12:11:02 2014 -0500 ---------------------------------------------------------------------- interface/cassandra.thrift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd276ebb/interface/cassandra.thrift ----------------------------------------------------------------------
