You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/11 17:04:35 UTC
[1/5] cassandra git commit: Remove misplaced lines in the changelog
(they already are in for 3.0.3, which is the correct place)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.3 b2af80b4a -> 4d9a0a1e6
refs/heads/trunk 20e6750df -> 0bb63d285
Remove misplaced lines in the changelog (they already are in for 3.0.3, which is the correct place)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fdcaef2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fdcaef2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fdcaef2
Branch: refs/heads/cassandra-3.3
Commit: 6fdcaef20b93b1116352d7094ecd7447dbdf5eb3
Parents: eca74ad
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jan 11 17:00:04 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jan 11 17:00:04 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fdcaef2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25c93e9..36a6e43 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -73,8 +73,6 @@ Merged from 2.1:
* Keep the file open in trySkipCache (CASSANDRA-10669)
* Updated trigger example (CASSANDRA-10257)
Merged from 2.2:
- * Fix regression on split size in CqlInputFormat (CASSANDRA-10835)
- * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
* Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592)
* Show CQL help in cqlsh in web browser (CASSANDRA-7225)
[3/5] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d9a0a1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d9a0a1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d9a0a1e
Branch: refs/heads/trunk
Commit: 4d9a0a1e67a1488c5628ff39df0a4a4cae21e67c
Parents: b2af80b 6fdcaef
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jan 11 17:04:05 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jan 11 17:04:05 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d9a0a1e/CHANGES.txt
----------------------------------------------------------------------
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d9a0a1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d9a0a1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d9a0a1e
Branch: refs/heads/cassandra-3.3
Commit: 4d9a0a1e67a1488c5628ff39df0a4a4cae21e67c
Parents: b2af80b 6fdcaef
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jan 11 17:04:05 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jan 11 17:04:05 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d9a0a1e/CHANGES.txt
----------------------------------------------------------------------
[5/5] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bb63d28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bb63d28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bb63d28
Branch: refs/heads/trunk
Commit: 0bb63d2852abc32261528abc192eabe76ef4480b
Parents: 20e6750 4d9a0a1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jan 11 17:04:15 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jan 11 17:04:15 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bb63d28/CHANGES.txt
----------------------------------------------------------------------
[2/5] cassandra git commit: Remove misplaced lines in the changelog
(they already are in for 3.0.3, which is the correct place)
Posted by sl...@apache.org.
Remove misplaced lines in the changelog (they already are in for 3.0.3, which is the correct place)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fdcaef2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fdcaef2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fdcaef2
Branch: refs/heads/trunk
Commit: 6fdcaef20b93b1116352d7094ecd7447dbdf5eb3
Parents: eca74ad
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jan 11 17:00:04 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jan 11 17:00:04 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fdcaef2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25c93e9..36a6e43 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -73,8 +73,6 @@ Merged from 2.1:
* Keep the file open in trySkipCache (CASSANDRA-10669)
* Updated trigger example (CASSANDRA-10257)
Merged from 2.2:
- * Fix regression on split size in CqlInputFormat (CASSANDRA-10835)
- * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
* Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592)
* Show CQL help in cqlsh in web browser (CASSANDRA-7225)