Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b093b4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b093b4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b093b4e Branch: refs/heads/trunk Commit: 6b093b4ead776418c44568fa0a72f843c60162b7 Parents: fd2863d 14d62ab Author: Aleksey Yeschenko <[email protected]> Authored: Fri Dec 28 02:37:12 2012 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Dec 28 02:37:12 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 86 ++- pylib/cqlshlib/cql3handling.py | 28 +- pylib/cqlshlib/displaying.py | 8 +- pylib/cqlshlib/formatting.py | 27 +- pylib/cqlshlib/test/__init__.py | 20 + pylib/cqlshlib/test/ansi_colors.py | 191 ++++ pylib/cqlshlib/test/basecase.py | 71 ++ pylib/cqlshlib/test/cassconnect.py | 159 ++++ pylib/cqlshlib/test/run_cqlsh.py | 271 ++++++ pylib/cqlshlib/test/table_arrangements.cql | 114 +++ pylib/cqlshlib/test/test_cql_parsing.py | 87 ++ pylib/cqlshlib/test/test_cqlsh_commands.py | 42 + pylib/cqlshlib/test/test_cqlsh_completion.py | 243 ++++++ pylib/cqlshlib/test/test_cqlsh_invocation.py | 78 ++ pylib/cqlshlib/test/test_cqlsh_output.py | 965 +++++++++++++++++++++ pylib/cqlshlib/test/test_keyspace_init2.cql | 180 ++++ pylib/cqlshlib/test/test_keyspace_init3.cql | 36 + 18 files changed, 2558 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b093b4e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2061c29,31563c6..b0a0066 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,6 +1,23 @@@ +1.2.1 + * Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087) + * fix hinting for dropped local writes (CASSANDRA-4753) + * off-heap cache doesn't need mutable column container (CASSANDRA-5057) + * apply disk_failure_policy to bad disks on initial directory creation + (CASSANDRA-4847) + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043) + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041) + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + * Log compaction merge counts (CASSANDRA-4894) + * Minimize byte array allocation by AbstractData{Input,Output} (CASSANDRA-5090) + + 1.2.0 * Disallow counters in collections (CASSANDRA-5082) + * cqlsh: add unit tests (CASSANDRA-3920) 1.2.0-rc2
