You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/08/17 13:41:41 UTC
[1/4] cassandra git commit: Update build.xml and debian/changelog for
3.0.9
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 8b5b1854c -> 5694a2ac3
refs/heads/trunk 6966fcda9 -> d4d71cd33
Update build.xml and debian/changelog for 3.0.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b5b1854
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b5b1854
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b5b1854
Branch: refs/heads/trunk
Commit: 8b5b1854c3a496dd13372aac896fb914f199ed88
Parents: bb56193
Author: Michael Shuler <ms...@apache.org>
Authored: Tue Aug 16 18:04:08 2016 -0500
Committer: Michael Shuler <ms...@apache.org>
Committed: Tue Aug 16 18:04:08 2016 -0500
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b5b1854/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 02e8687..acc7c9e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="3.0.8"/>
+ <property name="base.version" value="3.0.9"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b5b1854/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 69b7cf9..d54d59a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.9) unstable; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <ms...@apache.org> Tue, 16 Aug 2016 18:02:20 -0500
+
cassandra (3.0.8) unstable; urgency=medium
* New release
[2/4] cassandra git commit: Debug logging for unit tests
Posted by ma...@apache.org.
Debug logging for unit tests
Patch by marcuse; reviewed by Michael Shuler for CASSANDRA-12425
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5694a2ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5694a2ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5694a2ac
Branch: refs/heads/trunk
Commit: 5694a2ac3f227bdd22f1532059b566820deaf23e
Parents: 8b5b185
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Aug 10 08:34:28 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Aug 17 15:08:08 2016 +0200
----------------------------------------------------------------------
test/conf/logback-test.xml | 2 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5694a2ac/test/conf/logback-test.xml
----------------------------------------------------------------------
diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml
index abedc32..21c7142 100644
--- a/test/conf/logback-test.xml
+++ b/test/conf/logback-test.xml
@@ -68,7 +68,7 @@
<appender-ref ref="TEE"/>
</appender>
- <root level="INFO">
+ <root level="DEBUG">
<appender-ref ref="ASYNC" />
</root>
</configuration>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5694a2ac/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index c9c4631..7f5eb02 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -707,8 +707,8 @@ public abstract class CQLTester
UntypedResultSet rs;
if (usePrepared)
{
- if (logger.isDebugEnabled())
- logger.debug("Executing: {} with values {}", query, formatAllValues(values));
+ if (logger.isTraceEnabled())
+ logger.trace("Executing: {} with values {}", query, formatAllValues(values));
if (reusePrepared)
{
rs = QueryProcessor.executeInternal(query, transformValues(values));
@@ -728,14 +728,14 @@ public abstract class CQLTester
else
{
query = replaceValues(query, values);
- if (logger.isDebugEnabled())
- logger.debug("Executing: {}", query);
+ if (logger.isTraceEnabled())
+ logger.trace("Executing: {}", query);
rs = QueryProcessor.executeOnceInternal(query);
}
if (rs != null)
{
- if (logger.isDebugEnabled())
- logger.debug("Got {} rows", rs.size());
+ if (logger.isTraceEnabled())
+ logger.trace("Got {} rows", rs.size());
}
return rs;
}
[3/4] cassandra git commit: Debug logging for unit tests
Posted by ma...@apache.org.
Debug logging for unit tests
Patch by marcuse; reviewed by Michael Shuler for CASSANDRA-12425
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5694a2ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5694a2ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5694a2ac
Branch: refs/heads/cassandra-3.0
Commit: 5694a2ac3f227bdd22f1532059b566820deaf23e
Parents: 8b5b185
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Aug 10 08:34:28 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Aug 17 15:08:08 2016 +0200
----------------------------------------------------------------------
test/conf/logback-test.xml | 2 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5694a2ac/test/conf/logback-test.xml
----------------------------------------------------------------------
diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml
index abedc32..21c7142 100644
--- a/test/conf/logback-test.xml
+++ b/test/conf/logback-test.xml
@@ -68,7 +68,7 @@
<appender-ref ref="TEE"/>
</appender>
- <root level="INFO">
+ <root level="DEBUG">
<appender-ref ref="ASYNC" />
</root>
</configuration>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5694a2ac/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index c9c4631..7f5eb02 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -707,8 +707,8 @@ public abstract class CQLTester
UntypedResultSet rs;
if (usePrepared)
{
- if (logger.isDebugEnabled())
- logger.debug("Executing: {} with values {}", query, formatAllValues(values));
+ if (logger.isTraceEnabled())
+ logger.trace("Executing: {} with values {}", query, formatAllValues(values));
if (reusePrepared)
{
rs = QueryProcessor.executeInternal(query, transformValues(values));
@@ -728,14 +728,14 @@ public abstract class CQLTester
else
{
query = replaceValues(query, values);
- if (logger.isDebugEnabled())
- logger.debug("Executing: {}", query);
+ if (logger.isTraceEnabled())
+ logger.trace("Executing: {}", query);
rs = QueryProcessor.executeOnceInternal(query);
}
if (rs != null)
{
- if (logger.isDebugEnabled())
- logger.debug("Got {} rows", rs.size());
+ if (logger.isTraceEnabled())
+ logger.trace("Got {} rows", rs.size());
}
return rs;
}
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4d71cd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4d71cd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4d71cd3
Branch: refs/heads/trunk
Commit: d4d71cd331d9119f718b1ef6e4ed2bb3a1258ac1
Parents: 6966fcd 5694a2a
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Aug 17 15:38:12 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Aug 17 15:38:12 2016 +0200
----------------------------------------------------------------------
test/conf/logback-test.xml | 2 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d71cd3/test/conf/logback-test.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d71cd3/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------