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/8d8fed52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d8fed52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d8fed52 Branch: refs/heads/trunk Commit: 8d8fed52242c34b477d0384ba1d1ce3978efbbe8 Parents: 3d9db29 82fa5d5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Jul 19 00:21:30 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Jul 19 00:21:30 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DefsTables.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d8fed52/CHANGES.txt ----------------------------------------------------------------------
