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/18 07:04:31 UTC

[1/3] git commit: fix ex message grammar

Updated Branches:
  refs/heads/trunk 0ff5d9845 -> 77868a47e


fix ex message grammar


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

Branch: refs/heads/trunk
Commit: 1a2208ad121d1a80a8c4db031c6d4a60986c5d16
Parents: 3301a51
Author: Dave Brosius <db...@apache.org>
Authored: Sun Aug 18 01:00:28 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sun Aug 18 01:00:28 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/triggers/TriggerExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a2208ad/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
index 582a224..4b3c24a 100644
--- a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
+++ b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
@@ -128,7 +128,7 @@ public class TriggerExecutor
         }
         catch (Exception ex)
         {
-            throw new RuntimeException(String.format("Exception while creating trigger a trigger on CF with ID: %s", columnFamily.id()), ex);
+            throw new RuntimeException(String.format("Exception while creating trigger on CF with ID: %s", columnFamily.id()), ex);
         }
         finally
         {


[2/3] 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/c3993be8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3993be8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3993be8

Branch: refs/heads/trunk
Commit: c3993be8b1eb5d1ac4ca36f3cdd1b26af9636d7e
Parents: 1521ab0 1a2208a
Author: Dave Brosius <db...@apache.org>
Authored: Sun Aug 18 01:01:34 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sun Aug 18 01:01:34 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/triggers/TriggerExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[3/3] 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/77868a47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77868a47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77868a47

Branch: refs/heads/trunk
Commit: 77868a47eda0dfce902f154b029e63ee25b4e14c
Parents: 0ff5d98 c3993be
Author: Dave Brosius <db...@apache.org>
Authored: Sun Aug 18 01:03:08 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sun Aug 18 01:03:08 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/triggers/TriggerExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------