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 2015/05/05 20:28:03 UTC

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

Branch: refs/heads/trunk
Commit: bf21df2c3fde0a512438cf9722e065f3100ecff0
Parents: afb52aa 233ef34
Author: Josh McKenzie <jo...@datastax.com>
Authored: Tue May 5 13:26:59 2015 -0500
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Tue May 5 13:26:59 2015 -0500

----------------------------------------------------------------------
 conf/cassandra-env.ps1 | 2 +-
 conf/cassandra-env.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


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

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