cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.1' into trunk
Date Tue, 10 Apr 2012 20:29:04 GMT
Updated Branches:
  refs/heads/trunk 3f0dae762 -> aa83c7f2f


Merge branch 'cassandra-1.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/aa83c7f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa83c7f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa83c7f2

Branch: refs/heads/trunk
Commit: aa83c7f2f8fe6ac53400169ccdc517de01ec0880
Parents: 3f0dae7 eef93e7
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Apr 10 15:28:57 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Apr 10 15:28:57 2012 -0500

----------------------------------------------------------------------
 interface/cassandra.thrift                         |    8 +-
 .../org/apache/cassandra/thrift/Cassandra.java     |  762 ++++++++++++++-
 .../apache/cassandra/thrift/CassandraServer.java   |    5 +
 test/system/test_thrift_server.py                  |   12 +-
 4 files changed, 769 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message