You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/04/24 20:12:37 UTC
[12/25] git commit: fix CHANGES
fix CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a0cc8bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a0cc8bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a0cc8bb
Branch: refs/heads/trunk
Commit: 3a0cc8bbacc37e6ff5b06b06f75f00c25476ff40
Parents: edb4844
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Apr 20 11:01:47 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 24 13:11:34 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a0cc8bb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4d06b0a..7adf400 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,11 +25,11 @@
* Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156)
* Fix type in CQL3 ALTER TABLE preventing update (CASSANDRA-4170)
* Throw invalid exception from CQL3 on obsolete options (CASSANDRA-4171)
+ * fix stress build (CASSANDRA-4140)
+ * add time remaining estimate to nodetool compactionstats (CASSANDRA-4167)
Merged from 1.0:
* avoid streaming empty files with bulk loader if sstablewriter errors out
(CASSANDRA-3946)
- * fix stress build (CASSANDRA-4140)
- * add time remaining estimate to nodetool compactionstats (CASSANDRA-4167)
1.1-rc1