Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fba118e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fba118e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fba118e Branch: refs/heads/trunk Commit: 5fba118e95b6bc834169141514b8f563d5ffe6fb Parents: f70d8c0 88f36a0 Author: Paulo Motta <pa...@apache.org> Authored: Wed Feb 22 17:19:08 2017 -0300 Committer: Paulo Motta <pa...@apache.org> Committed: Wed Feb 22 17:19:08 2017 -0300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- pylib/cqlshlib/copyutil.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fba118e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a4bb9cd,1a22814..b744b40 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,7 @@@ -2.2.10 +3.0.12 + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) - +Merged from 2.2 + * Fix failing COPY TO STDOUT (CASSANDRA-12497) * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) Merged from 2.1: http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fba118e/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
