You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/11/29 19:19:50 UTC

[1/3] cassandra git commit: ninja fix CHANGES.txt

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.X 979f5f58e -> fff319bfd
  refs/heads/trunk db0be3465 -> 6622f8730


ninja fix CHANGES.txt


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

Branch: refs/heads/cassandra-3.X
Commit: fff319bfd62d7f8652b71ff4eeaad8c0260e4427
Parents: 979f5f5
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Nov 29 11:18:29 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Nov 29 11:18:29 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fff319bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fb85765..2aab0b2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,11 @@
 3.12
- * Remove timing window in test case (CASSANDRA-12875)
- * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
  * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
  * Add support for arithmetic operators (CASSANDRA-11935)
 
 
 3.10
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
  * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)


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

Posted by ja...@apache.org.
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 6622f8730cd92f6f270938227fd0cbf50020352f
Parents: db0be34 fff319b
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Nov 29 11:18:56 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Nov 29 11:19:13 2016 -0800

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

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



[2/3] cassandra git commit: ninja fix CHANGES.txt

Posted by ja...@apache.org.
ninja fix CHANGES.txt


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

Branch: refs/heads/trunk
Commit: fff319bfd62d7f8652b71ff4eeaad8c0260e4427
Parents: 979f5f5
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Nov 29 11:18:29 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Nov 29 11:18:29 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fff319bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fb85765..2aab0b2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,11 @@
 3.12
- * Remove timing window in test case (CASSANDRA-12875)
- * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
  * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
  * Add support for arithmetic operators (CASSANDRA-11935)
 
 
 3.10
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
  * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919)
  * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
  * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)