You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by al...@apache.org on 2015/11/06 19:40:20 UTC

[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33f5dc57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33f5dc57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33f5dc57

Branch: refs/heads/trunk
Commit: 33f5dc578064158f11fd38fd764b108b023f204c
Parents: fb9e75e 39bc5de
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Nov 6 18:40:03 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Nov 6 18:40:03 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                       |   1 +
 bin/cqlsh.py                                      |   6 +++---
 ...driver-internal-only-3.0.0a3.post0-3f15725.zip | Bin 0 -> 234113 bytes
 ...driver-internal-only-3.0.0a3.post0-a983923.zip | Bin 229492 -> 0 bytes
 pylib/cqlshlib/tracing.py                         |   8 ++++----
 5 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


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