Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/service/ReadCallback.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1ecb124
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1ecb124
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1ecb124
Branch: refs/heads/trunk
Commit: a1ecb1246e2fcc1e79d1bd51cdcf238948857883
Parents: 9189366 09ab439
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Tue Jan 28 21:55:11 2014 -0600
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Tue Jan 28 21:55:11 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/ReadCallback.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1ecb124/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1ecb124/src/java/org/apache/cassandra/service/ReadCallback.java
----------------------------------------------------------------------
