[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[ty...@apache.org]

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: 381cf568c9515a3134797bf9fe236da37b599064
Parents: 6445dd6 da3a5a7
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Aug 14 10:46:08 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Aug 14 10:46:08 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt  | 2 ++
 bin/cqlsh.py | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/381cf568/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 85eb223,6bc671d..bc17fcc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,7 -3,12 +19,9 @@@ Merged from 2.2
   * Route gossip messages over dedicated socket (CASSANDRA-9237)
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 - * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 - * UDF / UDA execution time in trace (CASSANDRA-9723)
 - * Fix broken internode SSL (CASSANDRA-9884)
  Merged from 2.1:
+  * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)
+  * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
   * Write hints for paxos commits (CASSANDRA-7342)
   * (cqlsh) Fix timestamps before 1970 on Windows, always
     use UTC for timestamp display (CASSANDRA-10000)