cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Mon, 08 Jun 2015 14:35:21 GMT
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/823d8579
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/823d8579
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/823d8579

Branch: refs/heads/trunk
Commit: 823d8579c59483673c27877303b0fd5d1a75df21
Parents: 4a61ca6 efb08ad
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Jun 8 09:34:59 2015 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Jun 8 09:34:59 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(-)
----------------------------------------------------------------------



Mime
View raw message