Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2723a40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2723a40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2723a40 Branch: refs/heads/trunk Commit: e2723a400d1fec823d853374d3a64c6d061c55a5 Parents: 816c2b3 116de2b Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue May 19 12:02:33 2015 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue May 19 12:02:33 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/triggers/ITrigger.java | 4 +-- .../cassandra/triggers/TriggerExecutor.java | 32 ++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2723a40/src/java/org/apache/cassandra/triggers/TriggerExecutor.java ----------------------------------------------------------------------
