You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2014/08/11 23:38:01 UTC
[46/50] [abbrv] git commit: Merge branch 'cassandra-2.1' into trunk
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/d2b24def
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2b24def
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2b24def
Branch: refs/heads/cassandra-2.1
Commit: d2b24deffe7dfc1a7e5138641f44e5348dedef1d
Parents: 5205ce6 1fee615
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 11 13:46:07 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 11 13:46:07 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +-
test/system/test_thrift_server.py | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2b24def/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2b24def/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2b24def/test/system/test_thrift_server.py
----------------------------------------------------------------------