cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-1.2' into trunk
Date Fri, 11 Jan 2013 17:05:41 GMT
Updated Branches:
  refs/heads/cassandra-1.1 3bb84e9e2 -> 1cbbba095
  refs/heads/cassandra-1.2 189131631 -> 18a1a4b93
  refs/heads/trunk 549996eab -> 1eea9227d


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

Branch: refs/heads/trunk
Commit: 1eea9227d05252cc570e0cc17909fd2f96fe2607
Parents: 549996e 18a1a4b
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Jan 11 11:05:22 2013 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Jan 11 11:05:22 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/thrift/CassandraServer.java   |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


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

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


Mime
View raw message