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/2d92f14b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d92f14b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d92f14b Branch: refs/heads/trunk Commit: 2d92f14baaae7f2dd4a61f602896dd3a4abf7d1f Parents: e185afa b4f262e Author: Aleksey Yeschenko <[email protected]> Authored: Tue Mar 11 15:33:10 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Mar 11 15:33:10 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 + doc/cql3/CQL.textile | 3 - .../org/apache/cassandra/config/CFMetaData.java | 3 + .../apache/cassandra/service/StorageProxy.java | 6 +- .../cassandra/triggers/TriggersSchemaTest.java | 126 +++++++++++++ .../apache/cassandra/triggers/TriggersTest.java | 179 +++++++++++++++++++ 6 files changed, 313 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d92f14b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d92f14b/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
