cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 06 Aug 2014 17:58:59 GMT
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/beeca7d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/beeca7d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/beeca7d2

Branch: refs/heads/trunk
Commit: beeca7d24c44398072325af76a5d3215aeb0bd95
Parents: 1528064 304260d
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Aug 6 12:58:44 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Aug 6 12:58:44 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +-
 conf/cassandra-env.sh                           |  4 ---
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +++-------
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 19 ++++++--------
 .../cassandra/locator/SimpleSeedProvider.java   | 27 ++++----------------
 .../service/EmbeddedCassandraService.java       |  5 ----
 6 files changed, 18 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/beeca7d2/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message