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/1521ab00 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1521ab00 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1521ab00 Branch: refs/heads/cassandra-2.0 Commit: 1521ab00322ef7631ecbb8f57ffbecc069aaab38 Parents: 11f0085 3301a51 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Aug 17 19:14:20 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Aug 17 19:14:20 2013 -0600 ---------------------------------------------------------------------- conf/triggers/README.txt | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------