Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbbdec63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbbdec63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbbdec63 Branch: refs/heads/cassandra-2.1 Commit: bbbdec63a419018cfb77732a55c66e140e7ce955 Parents: 4bdbdc1 f099e08 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Tue Sep 9 09:38:29 2014 +0700 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Tue Sep 9 09:38:29 2014 +0700 ---------------------------------------------------------------------- .../apache/cassandra/service/AbstractRowResolver.java | 4 ++-- .../org/apache/cassandra/service/RowDataResolver.java | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
