Merge branch 'cassandra-2.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/bf52074f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf52074f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf52074f Branch: refs/heads/trunk Commit: bf52074f6b66d468da0e9facddf291f3b472c07e Parents: af8c2a3 c7f9c8d Author: Tyler Hobbs <ty...@datastax.com> Authored: Wed Aug 27 14:22:38 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Wed Aug 27 14:22:38 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf52074f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf52074f/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------
