Updated Branches: refs/heads/cassandra-1.1 2ca2fb3fd -> b81f5723e refs/heads/trunk a6c5d3c43 -> 047106291
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/04710629 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04710629 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04710629 Branch: refs/heads/trunk Commit: 04710629100510e97a55f40e18bd5cdbe383de58 Parents: a6c5d3c b81f572 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Apr 27 16:07:35 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Apr 27 16:07:35 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 146 ++++++++++++++- build.xml | 1 - pylib/cqlshlib/cqlhandling.py | 18 ++- .../apache/cassandra/concurrent/StageManager.java | 14 ++- src/java/org/apache/cassandra/cql3/Cql.g | 8 +- .../org/apache/cassandra/utils/ByteBufferUtil.java | 10 +- 7 files changed, 181 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04710629/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04710629/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04710629/src/java/org/apache/cassandra/concurrent/StageManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04710629/src/java/org/apache/cassandra/utils/ByteBufferUtil.java ----------------------------------------------------------------------
