Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1c29d84 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1c29d84 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1c29d84 Branch: refs/heads/trunk Commit: c1c29d847abb129a71034a078150e13680d460f9 Parents: 0ec68f5 349d5db Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Sep 12 18:38:02 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Sep 12 18:38:02 2013 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 4 +++- .../apache/cassandra/cql3/UntypedResultSet.java | 14 ++++---------- .../cassandra/hadoop/pig/CassandraStorage.java | 17 +++++------------ 3 files changed, 12 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1c29d84/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
