remove changes line for 7149 as it was not pulled forward
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ce6b179 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ce6b179 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ce6b179 Branch: refs/heads/cassandra-2.1 Commit: 0ce6b179af6eaea35697af26bf647de3aec283cd Parents: a2c3476 Author: Dave Brosius <[email protected]> Authored: Sun May 4 10:50:58 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun May 4 10:50:58 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ce6b179/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3c87625..f4e14d8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -33,7 +33,6 @@ Merged from 1.2: * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751) * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831) - * fix time conversion to milliseconds in SimpleCondition.await (CASSANDRA-7149) 2.0.7
