You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2016/01/04 20:11:17 UTC

[1/2] cassandra git commit: ninja-fix issue number

Repository: cassandra
Updated Branches:
  refs/heads/trunk f54eab71d -> 691627bb2


ninja-fix issue number


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

Branch: refs/heads/trunk
Commit: f5416e38bc66de36be207891f2a7411f847a23dd
Parents: e4eabd9
Author: Robert Stupp <sn...@snazy.de>
Authored: Mon Jan 4 20:10:29 2016 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Mon Jan 4 20:10:29 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5416e38/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 03b9ecb..de5c3ed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@
  * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
  * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
  * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
- * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-1837)
+ * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
  * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
 Merged from 2.2:
  * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)


[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Posted by sn...@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/691627bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/691627bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/691627bb

Branch: refs/heads/trunk
Commit: 691627bb2336fbcddebf814fb5c675a1039ee370
Parents: f54eab7 f5416e3
Author: Robert Stupp <sn...@snazy.de>
Authored: Mon Jan 4 20:10:46 2016 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Mon Jan 4 20:10:46 2016 +0100

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


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