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/fd42aa3c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd42aa3c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd42aa3c Branch: refs/heads/trunk Commit: fd42aa3cf508fa1930184925cb714739500703b6 Parents: f10de18 a7a3282 Author: Jonathan Ellis <[email protected]> Authored: Wed Mar 19 01:05:13 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Mar 19 01:05:13 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/Schema.java | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd42aa3c/CHANGES.txt ----------------------------------------------------------------------
