cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Sat, 23 Mar 2013 23:08:02 GMT
Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17b51691
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17b51691
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17b51691

Branch: refs/heads/trunk
Commit: 17b51691371b95ed4113bd98280e3dc80c9cd53f
Parents: ae80948 0d51a54
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sat Mar 23 18:07:55 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sat Mar 23 18:07:55 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 src/java/org/apache/cassandra/gms/Gossiper.java    |    4 ++--
 .../org/apache/cassandra/tools/NodeToolHelp.yaml   |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/17b51691/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 12d4a04,c9bc5d7..e940f7b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
 +2.0
 + * Improve LeveledScanner work estimation (CASSANDRA-5250)
 + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430)
 + * Change Message IDs to ints (CASSANDRA-5307)
 + * Move sstable level information into the Stats component, removing the
 +   need for a separate Manifest file (CASSANDRA-4872)
 + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199)
 + * make index_interval configurable per columnfamily (CASSANDRA-3961)
 + * add default_time_to_live (CASSANDRA-3974)
 + * add memtable_flush_period_in_ms (CASSANDRA-4237)
 + * replace supercolumns internally by composites (CASSANDRA-3237, 5123)
 + * upgrade thrift to 0.9.0 (CASSANDRA-3719)
 + * drop unnecessary keyspace parameter from user-defined compaction API 
 +   (CASSANDRA-5139)
 + * more robust solution to incomplete compactions + counters (CASSANDRA-5151)
 + * Change order of directory searching for c*.in.sh (CASSANDRA-3983)
 + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271)
 + * Allow custom configuration loader (CASSANDRA-5045)
 + * Remove memory emergency pressure valve logic (CASSANDRA-3534)
 + * Reduce request latency with eager retry (CASSANDRA-4705)
 + * cqlsh: Remove ASSUME command (CASSANDRA-5331)
 +
 +
  1.2.4
+  * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
   * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
   * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
   * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/17b51691/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------


Mime
View raw message