Merge branch 'cassandra-1.0' into cassandra-1.1
Conflicts:
.rat-excludes
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a175336
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a175336
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a175336
Branch: refs/heads/trunk
Commit: 5a175336fb84ae3e09a0d8af4ab09c71948d78b7
Parents: d64b9ff 8ad7840
Author: Sylvain Lebresne <[email protected]>
Authored: Fri Feb 24 12:32:00 2012 +0100
Committer: Sylvain Lebresne <[email protected]>
Committed: Fri Feb 24 12:32:00 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 12 ++++
NEWS.txt | 4 +
debian/changelog | 6 ++
.../org/apache/cassandra/concurrent/Context.java | 51 ---------------
.../cassandra/net/IncomingTcpConnection.java | 4 +-
5 files changed, 24 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a175336/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a175336/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a175336/debian/changelog
----------------------------------------------------------------------
diff --cc debian/changelog
index 8f0ca37,4e96e0c..2b508c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+cassandra (1.1.0~beta1) unstable; urgency=low
+
+ * New beta release
+
+ -- Sylvain Lebresne <[email protected]> Wed, 15 Feb 2012 16:49:11 +0100
+
+ cassandra (1.0.8) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <[email protected]> Wed, 22 Feb 2012 15:09:54 +0100
+
cassandra (1.0.7) unstable; urgency=low
* New release
