You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2016/03/07 19:52:55 UTC

[1/3] cassandra git commit: 11210 is fixed in 3.5

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.5 eef2b189c -> c9e9b62eb
  refs/heads/trunk 3ae4f80e4 -> 615d0e155


11210 is fixed in 3.5


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

Branch: refs/heads/cassandra-3.5
Commit: c9e9b62ebc45344837d5692176ea97976c984074
Parents: eef2b18
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Mar 7 12:52:04 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 7 12:52:04 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9e9b62e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9699bfd..c791139 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ Merged from 3.0:
  * 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:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Only log yaml config once, at startup (CASSANDRA-11217)
  * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 Merged from 2.1:
@@ -63,7 +64,6 @@ Merged from 3.0:
    properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
- * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)


[3/3] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

Posted by yu...@apache.org.
Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 615d0e15551cbb7e8f5100b33723562c31876889
Parents: 3ae4f80 c9e9b62
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Mar 7 12:52:29 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 7 12:52:29 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/615d0e15/CHANGES.txt
----------------------------------------------------------------------


[2/3] cassandra git commit: 11210 is fixed in 3.5

Posted by yu...@apache.org.
11210 is fixed in 3.5


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

Branch: refs/heads/trunk
Commit: c9e9b62ebc45344837d5692176ea97976c984074
Parents: eef2b18
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Mar 7 12:52:04 2016 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 7 12:52:04 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9e9b62e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9699bfd..c791139 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ Merged from 3.0:
  * 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:
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Only log yaml config once, at startup (CASSANDRA-11217)
  * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 Merged from 2.1:
@@ -63,7 +64,6 @@ Merged from 3.0:
    properly (CASSANDRA-11050)
  * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 Merged from 2.2:
- * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
  * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)