You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/11/26 17:57:45 UTC

[1/2] cassandra git commit: Ninja Fix: remove separator in CHANGES.txt

Repository: cassandra
Updated Branches:
  refs/heads/trunk f8153a1d6 -> 20eedd0bd


Ninja Fix: remove separator in CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 9631ac1a0ed6853bd7131daf8bd33ae79a674ee8
Parents: e3113c9
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Nov 26 17:55:28 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Nov 26 17:55:28 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9631ac1a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5ea2b45..c9f3c38 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,6 @@
 
 3.1
 Merged from 3.0:
-=======
  * Fix SELECT statement with IN restrictions on partition key,
    ORDER BY and LIMIT (CASSANDRA-10729)
  * Improve stress performance over 1k threads (CASSANDRA-7217)


[2/2] cassandra git commit: Merge remote-tracking branch 'asf/cassandra-3.1' into trunk

Posted by bl...@apache.org.
Merge remote-tracking branch 'asf/cassandra-3.1' into trunk


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

Branch: refs/heads/trunk
Commit: 20eedd0bd1d11a61cf08ef706cb2f0d44465c785
Parents: f8153a1 9631ac1
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Nov 26 17:57:43 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Nov 26 17:57:43 2015 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------