You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/04/11 21:08:19 UTC
[1/6] cassandra git commit: CqlConfigHelper no longer requires both a
keystore and truststore to work.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 ab2b8a60c -> 19b4b637a
refs/heads/cassandra-3.0 5dbeef3f5 -> 4238cdd99
refs/heads/trunk cb1a63474 -> 6d43fc981
CqlConfigHelper no longer requires both a keystore and truststore to work.
patch by Jacek Lewandowski; reviewed by Jeremiah Jordan for CASSANDRA-11532
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19b4b637
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19b4b637
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19b4b637
Branch: refs/heads/cassandra-2.2
Commit: 19b4b637ac79b5d53b9384bd95bed8e08b43f111
Parents: ab2b8a6
Author: Jacek Lewandowski <le...@gmail.com>
Authored: Fri Apr 8 10:31:00 2016 -0500
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Apr 11 20:02:27 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +++++++++++++-------
2 files changed, 40 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19b4b637/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 419ed21..54013a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532)
* Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430)
* IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
* DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19b4b637/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index fe62ea7..35cdca8 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -517,13 +517,13 @@ public class CqlConfigHelper
Optional<String> truststorePassword = getInputNativeSSLTruststorePassword(conf);
Optional<String> keystorePassword = getInputNativeSSLKeystorePassword(conf);
Optional<String> cipherSuites = getInputNativeSSLCipherSuites(conf);
-
- if (truststorePath.isPresent() && keystorePath.isPresent() && truststorePassword.isPresent() && keystorePassword.isPresent())
+
+ if (truststorePath.isPresent())
{
SSLContext context;
try
{
- context = getSSLContext(truststorePath.get(), truststorePassword.get(), keystorePath.get(), keystorePassword.get());
+ context = getSSLContext(truststorePath, truststorePassword, keystorePath, keystorePassword);
}
catch (UnrecoverableKeyException | KeyManagementException |
NoSuchAlgorithmException | KeyStoreException | CertificateException | IOException e)
@@ -585,26 +585,46 @@ public class CqlConfigHelper
}
}
- private static SSLContext getSSLContext(String truststorePath, String truststorePassword, String keystorePath, String keystorePassword)
- throws NoSuchAlgorithmException, KeyStoreException, CertificateException, IOException, UnrecoverableKeyException, KeyManagementException
+ private static SSLContext getSSLContext(Optional<String> truststorePath,
+ Optional<String> truststorePassword,
+ Optional<String> keystorePath,
+ Optional<String> keystorePassword)
+ throws NoSuchAlgorithmException,
+ KeyStoreException,
+ CertificateException,
+ IOException,
+ UnrecoverableKeyException,
+ KeyManagementException
{
- SSLContext ctx;
- try (FileInputStream tsf = new FileInputStream(truststorePath); FileInputStream ksf = new FileInputStream(keystorePath))
- {
- ctx = SSLContext.getInstance("SSL");
+ SSLContext ctx = SSLContext.getInstance("SSL");
- KeyStore ts = KeyStore.getInstance("JKS");
- ts.load(tsf, truststorePassword.toCharArray());
- TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- tmf.init(ts);
-
- KeyStore ks = KeyStore.getInstance("JKS");
- ks.load(ksf, keystorePassword.toCharArray());
- KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
- kmf.init(ks, keystorePassword.toCharArray());
+ TrustManagerFactory tmf = null;
+ if (truststorePath.isPresent())
+ {
+ try (FileInputStream tsf = new FileInputStream(truststorePath.get()))
+ {
+ KeyStore ts = KeyStore.getInstance("JKS");
+ ts.load(tsf, truststorePassword.isPresent() ? truststorePassword.get().toCharArray() : null);
+ tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ tmf.init(ts);
+ }
+ }
- ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), new SecureRandom());
+ KeyManagerFactory kmf = null;
+ if (keystorePath.isPresent())
+ {
+ try (FileInputStream ksf = new FileInputStream(keystorePath.get()))
+ {
+ KeyStore ks = KeyStore.getInstance("JKS");
+ ks.load(ksf, keystorePassword.isPresent() ? keystorePassword.get().toCharArray() : null);
+ kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ kmf.init(ks, keystorePassword.isPresent() ? keystorePassword.get().toCharArray() : null);
+ }
}
+
+ ctx.init(kmf != null ? kmf.getKeyManagers() : null,
+ tmf != null ? tmf.getTrustManagers() : null,
+ new SecureRandom());
return ctx;
}
}
[3/6] cassandra git commit: CqlConfigHelper no longer requires both a
keystore and truststore to work.
Posted by al...@apache.org.
CqlConfigHelper no longer requires both a keystore and truststore to work.
patch by Jacek Lewandowski; reviewed by Jeremiah Jordan for CASSANDRA-11532
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19b4b637
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19b4b637
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19b4b637
Branch: refs/heads/trunk
Commit: 19b4b637ac79b5d53b9384bd95bed8e08b43f111
Parents: ab2b8a6
Author: Jacek Lewandowski <le...@gmail.com>
Authored: Fri Apr 8 10:31:00 2016 -0500
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Apr 11 20:02:27 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +++++++++++++-------
2 files changed, 40 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19b4b637/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 419ed21..54013a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532)
* Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430)
* IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
* DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19b4b637/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index fe62ea7..35cdca8 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -517,13 +517,13 @@ public class CqlConfigHelper
Optional<String> truststorePassword = getInputNativeSSLTruststorePassword(conf);
Optional<String> keystorePassword = getInputNativeSSLKeystorePassword(conf);
Optional<String> cipherSuites = getInputNativeSSLCipherSuites(conf);
-
- if (truststorePath.isPresent() && keystorePath.isPresent() && truststorePassword.isPresent() && keystorePassword.isPresent())
+
+ if (truststorePath.isPresent())
{
SSLContext context;
try
{
- context = getSSLContext(truststorePath.get(), truststorePassword.get(), keystorePath.get(), keystorePassword.get());
+ context = getSSLContext(truststorePath, truststorePassword, keystorePath, keystorePassword);
}
catch (UnrecoverableKeyException | KeyManagementException |
NoSuchAlgorithmException | KeyStoreException | CertificateException | IOException e)
@@ -585,26 +585,46 @@ public class CqlConfigHelper
}
}
- private static SSLContext getSSLContext(String truststorePath, String truststorePassword, String keystorePath, String keystorePassword)
- throws NoSuchAlgorithmException, KeyStoreException, CertificateException, IOException, UnrecoverableKeyException, KeyManagementException
+ private static SSLContext getSSLContext(Optional<String> truststorePath,
+ Optional<String> truststorePassword,
+ Optional<String> keystorePath,
+ Optional<String> keystorePassword)
+ throws NoSuchAlgorithmException,
+ KeyStoreException,
+ CertificateException,
+ IOException,
+ UnrecoverableKeyException,
+ KeyManagementException
{
- SSLContext ctx;
- try (FileInputStream tsf = new FileInputStream(truststorePath); FileInputStream ksf = new FileInputStream(keystorePath))
- {
- ctx = SSLContext.getInstance("SSL");
+ SSLContext ctx = SSLContext.getInstance("SSL");
- KeyStore ts = KeyStore.getInstance("JKS");
- ts.load(tsf, truststorePassword.toCharArray());
- TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- tmf.init(ts);
-
- KeyStore ks = KeyStore.getInstance("JKS");
- ks.load(ksf, keystorePassword.toCharArray());
- KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
- kmf.init(ks, keystorePassword.toCharArray());
+ TrustManagerFactory tmf = null;
+ if (truststorePath.isPresent())
+ {
+ try (FileInputStream tsf = new FileInputStream(truststorePath.get()))
+ {
+ KeyStore ts = KeyStore.getInstance("JKS");
+ ts.load(tsf, truststorePassword.isPresent() ? truststorePassword.get().toCharArray() : null);
+ tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ tmf.init(ts);
+ }
+ }
- ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), new SecureRandom());
+ KeyManagerFactory kmf = null;
+ if (keystorePath.isPresent())
+ {
+ try (FileInputStream ksf = new FileInputStream(keystorePath.get()))
+ {
+ KeyStore ks = KeyStore.getInstance("JKS");
+ ks.load(ksf, keystorePassword.isPresent() ? keystorePassword.get().toCharArray() : null);
+ kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ kmf.init(ks, keystorePassword.isPresent() ? keystorePassword.get().toCharArray() : null);
+ }
}
+
+ ctx.init(kmf != null ? kmf.getKeyManagers() : null,
+ tmf != null ? tmf.getTrustManagers() : null,
+ new SecureRandom());
return ctx;
}
}
[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4238cdd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4238cdd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4238cdd9
Branch: refs/heads/cassandra-3.0
Commit: 4238cdd99fd58f96a1c933f1c8113cf349300982
Parents: 5dbeef3 19b4b63
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Apr 11 20:07:04 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Apr 11 20:07:04 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +++++++++++++-------
2 files changed, 41 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4238cdd9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 76c9d99,54013a3..ed4c412
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,7 +1,32 @@@
-2.2.6
+3.0.6
+ * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)
+ * Notify indexers of expired rows during compaction (CASSANDRA-11329)
+ * Properly respond with ProtocolError when a v1/v2 native protocol
+ header is received (CASSANDRA-11464)
+ * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
+Merged from 2.2:
+ * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532)
* Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430)
* IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
+
++
+3.0.5
+ * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
+ * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
+ * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
+ * Upgrade ohc to 0.4.3
+ * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
+ * Allocate merkletrees with the correct size (CASSANDRA-11390)
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
* DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312)
* Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
* Add cassandra-stress keystore option (CASSANDRA-9325)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4238cdd9/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
[2/6] cassandra git commit: CqlConfigHelper no longer requires both a
keystore and truststore to work.
Posted by al...@apache.org.
CqlConfigHelper no longer requires both a keystore and truststore to work.
patch by Jacek Lewandowski; reviewed by Jeremiah Jordan for CASSANDRA-11532
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19b4b637
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19b4b637
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19b4b637
Branch: refs/heads/cassandra-3.0
Commit: 19b4b637ac79b5d53b9384bd95bed8e08b43f111
Parents: ab2b8a6
Author: Jacek Lewandowski <le...@gmail.com>
Authored: Fri Apr 8 10:31:00 2016 -0500
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Apr 11 20:02:27 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +++++++++++++-------
2 files changed, 40 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19b4b637/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 419ed21..54013a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532)
* Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430)
* IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
* DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19b4b637/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index fe62ea7..35cdca8 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -517,13 +517,13 @@ public class CqlConfigHelper
Optional<String> truststorePassword = getInputNativeSSLTruststorePassword(conf);
Optional<String> keystorePassword = getInputNativeSSLKeystorePassword(conf);
Optional<String> cipherSuites = getInputNativeSSLCipherSuites(conf);
-
- if (truststorePath.isPresent() && keystorePath.isPresent() && truststorePassword.isPresent() && keystorePassword.isPresent())
+
+ if (truststorePath.isPresent())
{
SSLContext context;
try
{
- context = getSSLContext(truststorePath.get(), truststorePassword.get(), keystorePath.get(), keystorePassword.get());
+ context = getSSLContext(truststorePath, truststorePassword, keystorePath, keystorePassword);
}
catch (UnrecoverableKeyException | KeyManagementException |
NoSuchAlgorithmException | KeyStoreException | CertificateException | IOException e)
@@ -585,26 +585,46 @@ public class CqlConfigHelper
}
}
- private static SSLContext getSSLContext(String truststorePath, String truststorePassword, String keystorePath, String keystorePassword)
- throws NoSuchAlgorithmException, KeyStoreException, CertificateException, IOException, UnrecoverableKeyException, KeyManagementException
+ private static SSLContext getSSLContext(Optional<String> truststorePath,
+ Optional<String> truststorePassword,
+ Optional<String> keystorePath,
+ Optional<String> keystorePassword)
+ throws NoSuchAlgorithmException,
+ KeyStoreException,
+ CertificateException,
+ IOException,
+ UnrecoverableKeyException,
+ KeyManagementException
{
- SSLContext ctx;
- try (FileInputStream tsf = new FileInputStream(truststorePath); FileInputStream ksf = new FileInputStream(keystorePath))
- {
- ctx = SSLContext.getInstance("SSL");
+ SSLContext ctx = SSLContext.getInstance("SSL");
- KeyStore ts = KeyStore.getInstance("JKS");
- ts.load(tsf, truststorePassword.toCharArray());
- TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- tmf.init(ts);
-
- KeyStore ks = KeyStore.getInstance("JKS");
- ks.load(ksf, keystorePassword.toCharArray());
- KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
- kmf.init(ks, keystorePassword.toCharArray());
+ TrustManagerFactory tmf = null;
+ if (truststorePath.isPresent())
+ {
+ try (FileInputStream tsf = new FileInputStream(truststorePath.get()))
+ {
+ KeyStore ts = KeyStore.getInstance("JKS");
+ ts.load(tsf, truststorePassword.isPresent() ? truststorePassword.get().toCharArray() : null);
+ tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ tmf.init(ts);
+ }
+ }
- ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), new SecureRandom());
+ KeyManagerFactory kmf = null;
+ if (keystorePath.isPresent())
+ {
+ try (FileInputStream ksf = new FileInputStream(keystorePath.get()))
+ {
+ KeyStore ks = KeyStore.getInstance("JKS");
+ ks.load(ksf, keystorePassword.isPresent() ? keystorePassword.get().toCharArray() : null);
+ kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ kmf.init(ks, keystorePassword.isPresent() ? keystorePassword.get().toCharArray() : null);
+ }
}
+
+ ctx.init(kmf != null ? kmf.getKeyManagers() : null,
+ tmf != null ? tmf.getTrustManagers() : null,
+ new SecureRandom());
return ctx;
}
}
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4238cdd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4238cdd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4238cdd9
Branch: refs/heads/trunk
Commit: 4238cdd99fd58f96a1c933f1c8113cf349300982
Parents: 5dbeef3 19b4b63
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Apr 11 20:07:04 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Apr 11 20:07:04 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +++++++++++++-------
2 files changed, 41 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4238cdd9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 76c9d99,54013a3..ed4c412
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,7 +1,32 @@@
-2.2.6
+3.0.6
+ * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)
+ * Notify indexers of expired rows during compaction (CASSANDRA-11329)
+ * Properly respond with ProtocolError when a v1/v2 native protocol
+ header is received (CASSANDRA-11464)
+ * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
+Merged from 2.2:
+ * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532)
* Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430)
* IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
+
++
+3.0.5
+ * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
+ * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
+ * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
+ * Upgrade ohc to 0.4.3
+ * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
+ * Allocate merkletrees with the correct size (CASSANDRA-11390)
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
* DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312)
* Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
* Add cassandra-stress keystore option (CASSANDRA-9325)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4238cdd9/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d43fc98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d43fc98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d43fc98
Branch: refs/heads/trunk
Commit: 6d43fc981299eb3eabc781af8572bdfc9f3cb37e
Parents: cb1a634 4238cdd
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Apr 11 20:07:50 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Apr 11 20:07:50 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +++++++++++++-------
2 files changed, 40 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d43fc98/CHANGES.txt
----------------------------------------------------------------------