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 2012/12/11 08:54:48 UTC
[5/5] git commit: Merge branch 'cassandra-1.2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45ab2d4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45ab2d4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45ab2d4d
Branch: refs/heads/cassandra-1.2
Commit: 45ab2d4d1820d23fbdb7ca3fc3686366df86b702
Parents: d6ccfb5 24f95e0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Dec 10 17:33:48 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Dec 10 17:33:48 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
pylib/cqlshlib/cql3handling.py | 93 +++++++++------
pylib/cqlshlib/formatting.py | 2 +-
.../apache/cassandra/io/sstable/SSTableReader.java | 4 +-
4 files changed, 62 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/45ab2d4d/CHANGES.txt
----------------------------------------------------------------------