Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fca83d81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fca83d81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fca83d81 Branch: refs/heads/trunk Commit: fca83d812533c1a2d268431bc815547b8ee5b3ba Parents: b40527f d2b7864 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Nov 4 13:00:02 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 4 13:00:02 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ conf/logback-tools.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fca83d81/CHANGES.txt ----------------------------------------------------------------------
