You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/08/22 02:53:08 UTC
[1/5] git commit: remove DuplicateMessageFilter,
isn't doing what we want
Updated Branches:
refs/heads/trunk 8079401c6 -> 99b504040
remove DuplicateMessageFilter, isn't doing what we want
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99e3c94e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99e3c94e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99e3c94e
Branch: refs/heads/trunk
Commit: 99e3c94ed8803572828202188569b19425621bc1
Parents: fe32c97
Author: Dave Brosius <db...@apache.org>
Authored: Wed Aug 21 10:44:21 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Aug 21 10:44:21 2013 -0400
----------------------------------------------------------------------
conf/logback.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/99e3c94e/conf/logback.xml
----------------------------------------------------------------------
diff --git a/conf/logback.xml b/conf/logback.xml
index cd17d44..5f34376 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -1,7 +1,5 @@
<configuration scan="true">
-
- <turboFilter class="ch.qos.logback.classic.turbo.DuplicateMessageFilter" AllowedRepetitions="100"/>
-
+
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>/var/log/cassandra/system.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
[4/5] git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Posted by db...@apache.org.
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/751b1e10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/751b1e10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/751b1e10
Branch: refs/heads/trunk
Commit: 751b1e1011e96ba38286b317caf0c793b95a14fe
Parents: 99e3c94 8079401
Author: Dave Brosius <db...@apache.org>
Authored: Wed Aug 21 20:50:13 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Aug 21 20:50:13 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 14 ++---
bin/cqlsh | 4 +-
doc/cql3/CQL.textile | 9 ++-
pylib/cqlshlib/cql3handling.py | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 43 +++++++------
.../apache/cassandra/cql3/QueryProcessor.java | 11 ++--
.../cql3/statements/ModificationStatement.java | 2 +-
.../cql3/statements/SelectStatement.java | 63 ++++++++++++++++----
.../compaction/LeveledCompactionStrategy.java | 2 +-
.../db/compaction/LeveledManifest.java | 12 ++--
.../cassandra/utils/obs/OffHeapBitSet.java | 4 +-
11 files changed, 104 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
[5/5] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.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/99b50404
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99b50404
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99b50404
Branch: refs/heads/trunk
Commit: 99b5040403af55e16ff37f9e50f5e6d5352de32e
Parents: 751b1e1 37a6792
Author: Dave Brosius <db...@apache.org>
Authored: Wed Aug 21 20:52:39 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Aug 21 20:52:39 2013 -0400
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/99b50404/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d153882,4fc9817..33e4f51
--- a/build.xml
+++ b/build.xml
@@@ -354,10 -353,8 +354,10 @@@
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
<dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.1.2"/>
<dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
- <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
+ <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0">
+ <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
+ </dependency>
- <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.6"/>
+ <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/>
<dependency groupId="junit" artifactId="junit" version="4.6" />
[2/5] git commit: update version of snakeyaml to 1.11 for maven for
cassandra-5917
Posted by db...@apache.org.
update version of snakeyaml to 1.11 for maven for cassandra-5917
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8551ff93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8551ff93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8551ff93
Branch: refs/heads/trunk
Commit: 8551ff93e9de972bc604d1804b86a10ecb2d3382
Parents: 72a702a
Author: Dave Brosius <db...@apache.org>
Authored: Wed Aug 21 20:45:17 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Aug 21 20:45:17 2013 -0400
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8551ff93/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ede74a9..4fc9817 100644
--- a/build.xml
+++ b/build.xml
@@ -354,7 +354,7 @@
<dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.1.2"/>
<dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
<dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
- <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.6"/>
+ <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/>
<dependency groupId="junit" artifactId="junit" version="4.6" />
[3/5] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by db...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37a67929
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37a67929
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37a67929
Branch: refs/heads/trunk
Commit: 37a67929556527089b2719ff20cbd920edaa4e7e
Parents: 0d769b9 8551ff9
Author: Dave Brosius <db...@apache.org>
Authored: Wed Aug 21 20:49:20 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Aug 21 20:49:20 2013 -0400
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------