Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/utils/FBUtilities.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/882cf258
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/882cf258
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/882cf258
Branch: refs/heads/cassandra-2.2
Commit: 882cf258412e54724dbcfd9c8c7ecc84d315693e
Parents: 1644599 08f4f5a
Author: T Jake Luciani <j...@apache.org>
Authored: Wed Jul 8 15:15:37 2015 -0400
Committer: T Jake Luciani <j...@apache.org>
Committed: Wed Jul 8 15:15:58 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 4 +-
build.xml | 13 ++++++-
.../org/apache/cassandra/utils/FBUtilities.java | 41 +-------------------
3 files changed, 16 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/882cf258/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2172672,568571d..cc7b109
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,9 +1,10 @@@
-2.1.9
+2.2.0-rc3
- Merged from 2.0:
++Merged from 2.1:
+ * Fix clientutil jar and tests (CASSANDRA-9760)
* (cqlsh) Allow the SSL protocol version to be specified through the
config file or environment variables (CASSANDRA-9544)
+ Merged from 2.0:
- * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
+ * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
* Fix growing pending background compaction (CASSANDRA-9662)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/882cf258/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 360accf,435d4a0..ebde62a
--- a/build.xml
+++ b/build.xml
@@@ -848,6 -832,7 +848,7 @@@
<include name="org/apache/cassandra/utils/FBUtilities*.class" />
<include name="org/apache/cassandra/exceptions/*.class" />
<include name="org/apache/cassandra/utils/CloseableIterator.class"
/>
- <include name="org/apache/cassandra/io/util/DataOutputPlus.class" />
++ <include name="org/apache/cassandra/io/util/*.class" />
</fileset>
<manifest>
<attribute name="Implementation-Title" value="Cassandra"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/882cf258/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/FBUtilities.java
index df65572,1b118ba..ce118b9
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@@ -48,12 -52,10 +48,12 @@@ import org.apache.cassandra.dht.Range
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.IVersionedSerializer;
+import org.apache.cassandra.io.compress.CompressionParameters;
import org.apache.cassandra.io.util.DataOutputBuffer;
-import org.apache.cassandra.io.util.IAllocator;
+import org.apache.cassandra.io.util.DataOutputBufferFixed;
+import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.net.AsyncOneResponse;
- import org.apache.thrift.*;
+
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.map.ObjectMapper;
