Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
NEWS.txt
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/858dfefe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/858dfefe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/858dfefe
Branch: refs/heads/trunk
Commit: 858dfefe345be81caab038210c47750ad805b7d7
Parents: 4b1fca7 6849942
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Feb 12 14:01:30 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Feb 12 14:01:30 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
build.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/858dfefe/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/858dfefe/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 772e8aa,6fa5172..421c8f3
--- a/build.xml
+++ b/build.xml
@@@ -25,7 -25,7 +25,7 @@@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="1.2.1"/>
- <property name="base.version" value="1.1.10"/>
++ <property name="base.version" value="1.2.2"/>
<property name="scm.connection"
value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection"
value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url"
value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
