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/774f3acb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/774f3acb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/774f3acb Branch: refs/heads/cassandra-2.1 Commit: 774f3acbfdcff3ab20c838023f6f1de0eb2d5626 Parents: f7fab28 6386abc Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Aug 6 12:14:36 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Aug 6 12:14:36 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/774f3acb/CHANGES.txt ----------------------------------------------------------------------
