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/08 16:35:20 UTC
[09/10] cassandra git commit: merge from 2.1
merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efb08ad3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efb08ad3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efb08ad3
Branch: refs/heads/trunk
Commit: efb08ad308d104b027bcb23a382072f6d516948d
Parents: 99a84bc 46ce21c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 8 09:34:52 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 8 09:34:52 2015 -0500
----------------------------------------------------------------------
bin/cassandra | 2 +-
bin/sstableupgrade | 4 ++--
examples/hadoop_cql3_word_count/bin/word_count | 2 +-
examples/hadoop_cql3_word_count/bin/word_count_counters | 2 +-
examples/hadoop_cql3_word_count/bin/word_count_setup | 2 +-
examples/hadoop_word_count/bin/word_count | 2 +-
examples/hadoop_word_count/bin/word_count_counters | 2 +-
examples/hadoop_word_count/bin/word_count_setup | 2 +-
tools/bin/cassandra-stress | 2 +-
tools/bin/cassandra-stressd | 2 +-
tools/bin/sstablelevelreset | 4 ++--
tools/bin/sstablemetadata | 2 +-
tools/bin/sstablesplit | 4 ++--
13 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efb08ad3/examples/hadoop_cql3_word_count/bin/word_count_counters
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efb08ad3/examples/hadoop_word_count/bin/word_count_counters
----------------------------------------------------------------------