cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 09 Sep 2014 02:39:58 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/AbstractRowResolver.java
	src/java/org/apache/cassandra/service/RowDataResolver.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/691d5308
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/691d5308
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/691d5308

Branch: refs/heads/trunk
Commit: 691d5308a7b07418cef5eee7f06f0ca03f639a4b
Parents: 1198df4 bbbdec6
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Tue Sep 9 09:39:26 2014 +0700
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Tue Sep 9 09:39:26 2014 +0700

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/RowDataResolver.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/691d5308/src/java/org/apache/cassandra/service/RowDataResolver.java
----------------------------------------------------------------------


Mime
View raw message