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/13c4719f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13c4719f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13c4719f Branch: refs/heads/trunk Commit: 13c4719f772bc43d15a22f903f6c46353a0fc349 Parents: c55cbc7 e57d027 Author: Mikhail Stepura <mish...@apache.org> Authored: Tue Oct 14 10:38:42 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Tue Oct 14 10:38:42 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13c4719f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13c4719f/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------