merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/457e09e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/457e09e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/457e09e9 Branch: refs/heads/trunk Commit: 457e09e91396e82520afb5d6727f6616b2c972fc Parents: cd20c3a ef50e8f Author: Pavel Yaskevich <[email protected]> Authored: Fri Mar 30 23:58:04 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Fri Mar 30 23:58:04 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/avro/internode.genavro | 2 + src/java/org/apache/cassandra/config/Avro.java | 20 +++++++++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/457e09e9/CHANGES.txt ----------------------------------------------------------------------
