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/3205c10d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3205c10d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3205c10d Branch: refs/heads/cassandra-2.0 Commit: 3205c10de90706d9ae2eb1982efae67fa575e214 Parents: ed4a067 af85f23 Author: Jonathan Ellis <[email protected]> Authored: Tue Aug 6 16:56:01 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Aug 6 16:56:01 2013 -0500 ---------------------------------------------------------------------- .../cassandra/triggers/TriggerExecutor.java | 6 ++++-- .../org/apache/cassandra/utils/FBUtilities.java | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
