Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efbf3c76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efbf3c76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efbf3c76
Branch: refs/heads/trunk
Commit: efbf3c768caee2287360d2ba7e31fd89214d2c05
Parents: 35801be dfcb734
Author: Sylvain Lebresne <[email protected]>
Authored: Fri May 23 18:03:06 2014 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Fri May 23 18:03:06 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/UserTypes.java | 6 ------
.../cassandra/hadoop/pig/AbstractCassandraStorage.java | 11 +++++++++--
3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbf3c76/CHANGES.txt
----------------------------------------------------------------------
