Updated Branches: refs/heads/trunk 08e37bde6 -> eb68247c9
Merge branch 'cassandra-1.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/eb68247c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb68247c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb68247c Branch: refs/heads/trunk Commit: eb68247c92ae74d22ec3d76772c1aed6ae787785 Parents: 08e37bd ea28f42 Author: Sylvain Lebresne <[email protected]> Authored: Fri Feb 24 13:59:20 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Feb 24 13:59:20 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 12 ++ NEWS.txt | 4 + bin/cqlsh | 12 +- debian/changelog | 6 + doc/cql/CQL.textile | 2 +- pylib/cqlshlib/cqlhandling.py | 5 +- .../org/apache/cassandra/concurrent/Context.java | 51 -------- .../cassandra/net/IncomingTcpConnection.java | 4 +- src/java/org/apache/cassandra/utils/XMLUtils.java | 90 --------------- 9 files changed, 35 insertions(+), 151 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb68247c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb68247c/NEWS.txt ----------------------------------------------------------------------
