You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2014/08/11 23:37:32 UTC

[17/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk

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 <sy...@datastax.com>
Authored: Wed Aug 6 12:14:36 2014 +0200
Committer: Sylvain Lebresne <sy...@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
----------------------------------------------------------------------