You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/05/28 22:24:13 UTC

[1/2] git commit: CHANGES.txt whitespace

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 35efdc1e3 -> 04ba46231


CHANGES.txt whitespace


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

Branch: refs/heads/cassandra-2.0
Commit: a37482144ff0048cfd6d741405791a803966f407
Parents: 4e67631
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed May 28 23:22:55 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed May 28 23:22:55 2014 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3748214/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7021e7b..e7d7028 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,7 @@
  * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
  * exit CQLSH with error status code if script fails (CASSANDRA-6344)
 
+
 1.2.16
  * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
  * add extra SSL cipher suites (CASSANDRA-6613)

[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/cassandra-2.0
Commit: 04ba46231d4ce6a354762a41313349ef0a24655d
Parents: 35efdc1 a374821
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed May 28 23:23:52 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed May 28 23:23:52 2014 +0300

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

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