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 2015/01/09 06:29:31 UTC
[1/3] cassandra git commit: fix typo causing bad format string marker
Repository: cassandra
Updated Branches:
refs/heads/trunk 2fc3a8934 -> dde4d8293
fix typo causing bad format string marker
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed54e808
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed54e808
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed54e808
Branch: refs/heads/trunk
Commit: ed54e80855a37f88a8625e1ecf9ce574f0d4081d
Parents: e750ab2
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jan 9 00:27:47 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jan 9 00:27:47 2015 -0500
----------------------------------------------------------------------
.../db/compaction/DateTieredCompactionStrategyTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed54e808/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 299e1af..84230da 100644
--- a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@ -70,7 +70,7 @@ public class DateTieredCompactionStrategyTest extends SchemaLoader
{
options.put(DateTieredCompactionStrategyOptions.BASE_TIME_KEY, "-1337");
validateOptions(options);
- fail(String.format("%Negative %s should be rejected", DateTieredCompactionStrategyOptions.BASE_TIME_KEY));
+ fail(String.format("Negative %s should be rejected", DateTieredCompactionStrategyOptions.BASE_TIME_KEY));
}
catch (ConfigurationException e)
{
@@ -81,7 +81,7 @@ public class DateTieredCompactionStrategyTest extends SchemaLoader
{
options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, "-1337");
validateOptions(options);
- fail(String.format("%Negative %s should be rejected", DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY));
+ fail(String.format("Negative %s should be rejected", DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY));
}
catch (ConfigurationException e)
{
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/818ec331
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/818ec331
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/818ec331
Branch: refs/heads/trunk
Commit: 818ec33107be17e000b182ab682013528a596d9b
Parents: 8c5a959 ed54e80
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jan 9 00:28:30 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jan 9 00:28:30 2015 -0500
----------------------------------------------------------------------
.../db/compaction/DateTieredCompactionStrategyTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/818ec331/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
----------------------------------------------------------------------
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dde4d829
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dde4d829
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dde4d829
Branch: refs/heads/trunk
Commit: dde4d82938f0d5951b0473cfb9d62d7ab0d9b637
Parents: 2fc3a89 818ec33
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jan 9 00:28:56 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jan 9 00:28:56 2015 -0500
----------------------------------------------------------------------
.../db/compaction/DateTieredCompactionStrategyTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dde4d829/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
----------------------------------------------------------------------