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-1.2' into trunk
Date Fri, 18 Jan 2013 16:05:16 GMT
Updated Branches:
  refs/heads/trunk 8646f9763 -> 66b9d114e


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/66b9d114
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66b9d114
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66b9d114

Branch: refs/heads/trunk
Commit: 66b9d114e71ecfaf2e3e4e24ea901ed138d0ce06
Parents: 8646f97 056f38c
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jan 18 17:05:07 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jan 18 17:05:07 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 ++
 NEWS.txt                                           |    5 +++++
 .../org/apache/cassandra/service/StorageProxy.java |   10 ++++++++++
 .../apache/cassandra/thrift/CassandraServer.java   |   11 ++++++++++-
 4 files changed, 27 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66b9d114/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66b9d114/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------


Mime
View raw message