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 2015/06/01 17:28:18 UTC
[10/10] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc6d1429
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc6d1429
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc6d1429
Branch: refs/heads/trunk
Commit: cc6d1429836ad042b6c956fe9230a30ef9a0e459
Parents: d0da2f5 c11644b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 1 10:28:01 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 1 10:28:01 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/sstablekeys | 2 +-
bin/sstableloader | 2 +-
bin/sstablescrub | 2 +-
bin/sstableupgrade | 2 +-
tools/bin/json2sstable | 2 +-
tools/bin/sstable2json | 2 +-
tools/bin/sstablesplit | 2 +-
8 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc6d1429/CHANGES.txt
----------------------------------------------------------------------