Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e234b314 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e234b314 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e234b314 Branch: refs/heads/trunk Commit: e234b314a550df301545feda01647a77453f6b64 Parents: 1e66e97 29c6f1d Author: Robert Stupp <sn...@snazy.de> Authored: Sun Sep 13 11:37:26 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Sun Sep 13 11:37:26 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 2 +- pylib/cqlshlib/cqlhandling.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e234b314/CHANGES.txt ----------------------------------------------------------------------
