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/131097c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/131097c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/131097c2 Branch: refs/heads/trunk Commit: 131097c2cbf95fe5134ddc2bdd27ff79c9b4a8c7 Parents: e1651cb 9aff086 Author: Mikhail Stepura <[email protected]> Authored: Sat Sep 6 19:58:09 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Sat Sep 6 19:58:09 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ pylib/cqlshlib/cql3handling.py | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/131097c2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/131097c2/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------
