Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6386abc0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6386abc0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6386abc0 Branch: refs/heads/trunk Commit: 6386abc07c8ee0ae0a3e33744fbfef5106766694 Parents: 40a1cd3 a7d950e Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Aug 6 12:13:38 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Aug 6 12:13:38 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/EmbeddedCassandraService.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6386abc0/CHANGES.txt ----------------------------------------------------------------------
