[2/3] git commit: update changes

2014-01-14 Thread brandonwilliams
update changes


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

Branch: refs/heads/trunk
Commit: 7514e61b48e9456cf6591abaf6dbf17b52217883
Parents: 05f1209
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Jan 14 21:27:19 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Jan 14 21:27:19 2014 -0600

--
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7514e61b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ef2df51..2bbf809 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@
  * Wait for gossip to settle before accepting client connections 
(CASSANDRA-4288)
  * Delete unfinished compaction incrementally (CASSANDRA-6086)
  * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480)
+ * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485)
+ * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584)
 Merged from 1.2:
  * fsync compression metadata (CASSANDRA-6531)
  * Validate CF existence on execution for prepared statement (CASSANDRA-6535)



[2/3] git commit: update changes

2013-10-22 Thread brandonwilliams
update changes


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

Branch: refs/heads/trunk
Commit: 2629e5e4ee0afbce6f12d54a1ee301501348d8fb
Parents: 4155afd
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Oct 22 16:49:03 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Oct 22 16:49:03 2013 -0500

--
 CHANGES.txt | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2629e5e4/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index ac4c010..c01b4a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.0.3
+ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
+
+
 2.0.2
  * Update FailureDetector to use nanontime (CASSANDRA-4925)
  * Fix FileCacheService regressions (CASSANDRA-6149)



[2/3] git commit: update CHANGES retroactively

2013-01-08 Thread jbellis
update CHANGES retroactively


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

Branch: refs/heads/trunk
Commit: 5c8f0994f96ec09ed157c6c3640c5441d033eb88
Parents: a96a8d4
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Jan 8 15:42:22 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Jan 8 15:42:22 2013 -0600

--
 CHANGES.txt |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c8f0994/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 37a47f3..22a3bbd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -35,6 +35,8 @@ Merged from 1.1:
  * Disallow counters in collections (CASSANDRA-5082)
  * cqlsh: add unit tests (CASSANDRA-3920)
  * fix default bloom_filter_fp_chance for LeveledCompactionStrategy 
(CASSANDRA-5093)
+Merged from 1.1:
+ * add validation for get_range_slices with start_key and end_token 
(CASSANDRA-5089)
 
 
 1.2.0-rc2



[2/3] git commit: update CHANGES

2012-05-21 Thread jbellis
update CHANGES


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

Branch: refs/heads/trunk
Commit: eef77963517da36854eebe7b3293cbe1b16b9ac9
Parents: 0267293
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon May 21 17:15:51 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon May 21 17:15:51 2012 -0500

--
 CHANGES.txt |   20 +++-
 1 files changed, 11 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eef77963/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4d178d0..1df85f6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,15 +16,14 @@
  * Optimize reads when row deletion timestamps allow us to restrict
the set of sstables we check (CASSANDRA-4116)
  * incremental repair by token range (CASSANDRA-3912)
- * streaming commitlog backup + pitr (CASSANDRA-3690)
+ * add support for commitlog archiving and point-in-time recovery
+   (CASSANDRA-3690)
  * avoid generating redundant compaction tasks during streaming
(CASSANDRA-4174)
  * add -cf option to nodetool snapshot, and takeColumnFamilySnapshot to
StorageService mbean (CASSANDRA-556)
  * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079)
  * optimize truncate when autosnapshot is disabled (CASSANDRA-4153)
- * add support for commitlog archiving and point-in-time recovery
-   (CASSANDRA-3647)
  * update caches to use byte[] keys to reduce memory overhead (CASSANDRA-3966)
  * add column limit to cli (CASSANDRA-3012, 4098)
  * clean up and optimize DataOutputBuffer, used by CQL compression and
@@ -33,9 +32,11 @@
  * identify and blacklist corrupted SSTables from future compactions 
(CASSANDRA-2261)
  * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037)
- * Expose repairing by a user provided range (CASSANDRA-3912)
- * Add way to force the cassandra-cli to refresh it's schema (CASSANDRA-4052)
- * Avoids having replicate on write tasks stacking up at CL.ONE 
(CASSANDRA-2889)
+ * Expose API to repair a user provided range (CASSANDRA-3912)
+ * Add way to force the cassandra-cli to refresh its schema (CASSANDRA-4052)
+ * Avoid having replicate on write tasks stacking up at CL.ONE (CASSANDRA-2889)
+ * (cql3) Backwards compatibility for composite comparators in non-cql3-aware
+   clients (CASSANDRA-4093)
  * (cql3) Fix order by for reversed queries (CASSANDRA-4160)
  * (cql3) Add ReversedType support (CASSANDRA-4004)
  * (cql3) Add timeuuid type (CASSANDRA-4194)
@@ -48,11 +49,12 @@
  * (cql3) Allow paging through non-ordered partitioner results (CASSANDRA-3771)
  * (cql3) Fix drop index (CASSANDRA-4192)
  * (cql3) Don't return range ghosts anymore (CASSANDRA-3982)
- * fix the problem re-creating Keyspace/ColumnFamily (CASSANDRA-4219)
- * fix SecondaryIndex LelevedManifest save upon snapshot (CASSANDRA-4230)
+ * fix re-creating Keyspaces/ColumnFamilies with the same name as dropped
+   ones (CASSANDRA-4219)
+ * fix SecondaryIndex LeveledManifest save upon snapshot (CASSANDRA-4230)
  * fix missing arrayOffset in FBUtilities.hash (CASSANDRA-4250)
  * (cql3) Add name of parameters in CqlResultSet (CASSANDRA-4242)
- * (cql3) Correctly validat order by queries (CASSANDRA-4246)
+ * (cql3) Correctly validate order by queries (CASSANDRA-4246)
  * rename stress to cassandra-stress for saner packaging (CASSANDRA-4256)
 Merged from 1.0:
  * Fix super columns bug where cache is not updated (CASSANDRA-4190)