[1/3] git commit: update changes

[brandonwilliams]

Updated Branches:
  refs/heads/cassandra-2.0 05f120991 -> 7514e61b4
  refs/heads/trunk 54f728c77 -> 312286772


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/cassandra-2.0
Commit: 7514e61b48e9456cf6591abaf6dbf17b52217883
Parents: 05f1209
Author: Brandon Williams 
Authored: Tue Jan 14 21:27:19 2014 -0600
Committer: Brandon Williams 
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)

[1/3] git commit: update changes

[brandonwilliams]

Updated Branches:
  refs/heads/cassandra-2.0 4155afd51 -> 2629e5e4e
  refs/heads/trunk dba12f386 -> 6cb5da88a


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/cassandra-2.0
Commit: 2629e5e4ee0afbce6f12d54a1ee301501348d8fb
Parents: 4155afd
Author: Brandon Williams 
Authored: Tue Oct 22 16:49:03 2013 -0500
Committer: Brandon Williams 
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)

[1/3] git commit: update CHANGES retroactively

[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/cassandra-1.2
Commit: 5c8f0994f96ec09ed157c6c3640c5441d033eb88
Parents: a96a8d4
Author: Jonathan Ellis 
Authored: Tue Jan 8 15:42:22 2013 -0600
Committer: Jonathan Ellis 
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