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:16 UTC
[08/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c11644bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c11644bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c11644bb
Branch: refs/heads/cassandra-2.2
Commit: c11644bbfb5939a8d1efa14d57385e98b0e59ca9
Parents: c34a329 40c3ad6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 1 10:27:55 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 1 10:27:55 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/c11644bb/CHANGES.txt
----------------------------------------------------------------------