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

Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/13 20:30:16 UTC

[6/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.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/aab47117
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aab47117
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aab47117

Branch: refs/heads/cassandra-2.1
Commit: aab4711795adf563cc2decfa4ab5267b8e1a1d9a
Parents: 88ad4f4 efde6ae
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:29:53 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:29:53 2014 -0500

----------------------------------------------------------------------
 conf/cassandra-env.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aab47117/conf/cassandra-env.sh
----------------------------------------------------------------------