You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/07/16 23:18:18 UTC

[12/12] 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/e69fee52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e69fee52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e69fee52

Branch: refs/heads/trunk
Commit: e69fee52b9b9664d4c4743db94e61b83a2330426
Parents: 287bea3 367a369
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jul 16 16:18:01 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jul 16 16:18:01 2014 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------