cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 08 May 2014 16:05:37 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 28497fd11b2f60e14ddb4cc7ce9b3e4b7ee44f79
Parents: 6e79342 8dab582
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu May 8 18:05:28 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu May 8 18:05:28 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/db/marshal/AbstractType.java     | 3 +--
 .../apache/cassandra/serializers/InetAddressSerializer.java    | 2 +-
 .../org/apache/cassandra/serializers/IntegerSerializer.java    | 6 +++---
 src/java/org/apache/cassandra/serializers/LongSerializer.java  | 2 +-
 .../org/apache/cassandra/serializers/TimestampSerializer.java  | 2 +-
 src/java/org/apache/cassandra/serializers/UUIDSerializer.java  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28497fd1/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/28497fd1/src/java/org/apache/cassandra/db/marshal/AbstractType.java
----------------------------------------------------------------------


Mime
View raw message