You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/05/19 13:11:03 UTC

[9/9] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

Merge branch 'cassandra-2.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/3a6e9c91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a6e9c91
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a6e9c91

Branch: refs/heads/trunk
Commit: 3a6e9c91b83ad0dc9b2423b51975277c790af66d
Parents: c844bfe 86c9c00
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue May 19 12:05:24 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue May 19 12:05:24 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/triggers/ITrigger.java |  4 +-
 .../cassandra/triggers/TriggerExecutor.java     | 32 +++++++++++++
 .../apache/cassandra/triggers/TriggersTest.java | 49 +++++++++++++++-----
 3 files changed, 72 insertions(+), 13 deletions(-)
----------------------------------------------------------------------