Merge branch 'cassandra-1.0' into cassandra-1.1.0 Conflicts: build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83371ebe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83371ebe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83371ebe Branch: refs/heads/trunk Commit: 83371ebe8f324c12065f49f1c4d4edfea6dc9e05 Parents: 0a96944 062ee3f Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Apr 3 18:07:25 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Apr 3 18:07:25 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- build.xml | 44 ++------------- .../cassandra/db/compaction/LeveledManifest.java | 18 +++--- 3 files changed, 15 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83371ebe/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83371ebe/build.xml ---------------------------------------------------------------------- diff --cc build.xml index b36e87c,ebd80f6..02a68ae --- a/build.xml +++ b/build.xml @@@ -24,12 -24,11 +24,11 @@@ <property file="build.properties.default" /> <property name="debuglevel" value="source,lines,vars"/> - <!-- default version and SCM information (we need the default SCM info as people may checkout with git-svn) --> + <!-- default version and SCM information --> - <property name="base.version" value="1.0.9"/> + <property name="base.version" value="1.1.0-beta2"/> - <property name="scm.default.path" value="cassandra/branches/cassandra-1.1"/> - <property name="scm.default.connection" value="scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}"/> - <property name="scm.default.developerConnection" value="scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}"/> - <property name="scm.default.url" value="http://svn.apache.org/viewvc/${scm.default.path}"/> + <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"/> <!-- directory details --> <property name="basedir" value="."/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/83371ebe/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------