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/335aa9f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/335aa9f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/335aa9f1 Branch: refs/heads/trunk Commit: 335aa9f1f6cd25be6990f8df2e5839b7806edac6 Parents: e13b11d 6e366e3 Author: Jonathan Ellis <[email protected]> Authored: Wed Mar 19 12:12:11 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Mar 19 12:12:11 2014 -0500 ---------------------------------------------------------------------- interface/cassandra.thrift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/335aa9f1/interface/cassandra.thrift ----------------------------------------------------------------------
