Updated Branches:
  refs/heads/cassandra-1.1 0cc168a96 -> 0ba2631ee
  refs/heads/trunk d0d21aded -> 054358bf4


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/054358bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/054358bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/054358bf

Branch: refs/heads/trunk
Commit: 054358bf44cee49a1b1f5bed8cdc86ae2408b3c1
Parents: d0d21ad 0ba2631
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Mon Jun 18 13:24:57 2012 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Mon Jun 18 13:24:57 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                    |    1 +
 bin/cqlsh                      |  227 +++++++++++++++++++++++++++++++++--
 pylib/cqlshlib/cql3handling.py |    4 +-
 pylib/cqlshlib/cqlhandling.py  |   15 ++-
 4 files changed, 233 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


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

Reply via email to