You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/11 20:04:09 UTC
[14/14] git commit: Merge branch 'cassandra-2.1' into trunk
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/755d345f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/755d345f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/755d345f
Branch: refs/heads/trunk
Commit: 755d345fefafa1384e26269e6381e5b517216a42
Parents: c7e191b 0c6078a
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 11 13:03:47 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 11 13:03:47 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 +
.../cql3/statements/AlterTableStatement.java | 23 +++-
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 2 +-
.../cassandra/hadoop/cql3/CqlRecordReader.java | 138 ++++++++++++++++++-
.../cassandra/hadoop/pig/CqlNativeStorage.java | 15 +-
.../apache/cassandra/hadoop/pig/CqlStorage.java | 4 +-
.../apache/cassandra/cql3/AlterTableTest.java | 86 ++++++++++++
7 files changed, 260 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/755d345f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/755d345f/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/755d345f/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/755d345f/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------