cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Date Fri, 02 Aug 2013 18:03:15 GMT
Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 98214bb6a0568f129cd1c38cf4bb3af9f67b28a3
Parents: 532db4d 88bc4f2
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Fri Aug 2 11:02:49 2013 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Fri Aug 2 11:02:49 2013 -0700

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/98214bb6/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index da653c8,e69341e..d3ef50c
--- a/build.xml
+++ b/build.xml
@@@ -657,9 -712,9 +657,9 @@@
          <pathelement location="${basedir}/build/classes/main" />
          <pathelement location="${basedir}/build/classes/thrift" />
      </path>
 -    <target name="stress-build" depends="build">
 +    <target name="stress-build" depends="build" description="build stress tool">
      	<mkdir dir="${stress.build.classes}" />
-         <javac destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}"
target="${target.version}">
+         <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}"
includeantruntime="true" source="${source.version}" target="${target.version}">
              <src path="${stress.build.src}" />
              <classpath>
                  <path refid="cassandra.classes" />


Mime
View raw message