cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [9/9] git commit: Merge branch 'cassandra-1.2' into trunk
Date Fri, 25 Jan 2013 20:27:57 GMT
Updated Branches:
  refs/heads/cassandra-1.1 9c8d94930 -> 3298c2f19
  refs/heads/cassandra-1.2 8540974db -> f4a941e49
  refs/heads/trunk 6a15bb37b -> b7ba0a917


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: b7ba0a917736088c2c6e94396487d28008f71b18
Parents: 6a15bb3 f4a941e
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Jan 25 14:27:44 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Jan 25 14:27:44 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    4 +++
 build.xml                                          |    2 +-
 debian/changelog                                   |    6 +++++
 .../cassandra/io/util/PoolingSegmentedFile.java    |   17 +++++++++++++++
 .../apache/cassandra/thrift/ThriftValidation.java  |    2 +-
 .../apache/cassandra/utils/SemanticVersion.java    |    2 +-
 .../cassandra/utils/SemanticVersionTest.java       |    2 +-
 7 files changed, 31 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ba0a91/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ba0a91/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------


Mime
View raw message