You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/02/02 15:01:50 UTC
[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b087b4c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b087b4c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b087b4c7
Branch: refs/heads/cassandra-3.0
Commit: b087b4c7d5c0fd4e024f1d970437de59d44cd0c8
Parents: bc3ea66 af2b858
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 2 14:59:41 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 2 14:59:41 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 87 +++++++++++++-------
.../cassandra/transport/ServerConnection.java | 4 +-
3 files changed, 58 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b087b4c7/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b087b4c7/src/java/org/apache/cassandra/transport/ServerConnection.java
----------------------------------------------------------------------