You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/06 23:56:32 UTC
[16/17] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
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/trunk
Commit: 3205c10de90706d9ae2eb1982efae67fa575e214
Parents: ed4a067 af85f23
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:56:01 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
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(-)
----------------------------------------------------------------------