cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 23 Apr 2014 19:08:19 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: ec7206ce6a50d2ca03ac23f8ba6ec8eea9cfe6d8
Parents: f22e775 1f52122
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Apr 23 22:07:10 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Apr 23 22:07:10 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 src/java/org/apache/cassandra/db/Mutation.java  |   5 +
 .../apache/cassandra/service/StorageProxy.java  |  23 +-
 .../cassandra/triggers/TriggerExecutor.java     |  71 ++--
 .../cassandra/triggers/TriggerExecutorTest.java | 336 +++++++++++++++++++
 .../apache/cassandra/triggers/TriggersTest.java |  22 +-
 6 files changed, 410 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec7206ce/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec7206ce/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
----------------------------------------------------------------------


Mime
View raw message