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/8b49af0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b49af0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b49af0b Branch: refs/heads/trunk Commit: 8b49af0b747d854d978d549344cf67f47ccfe618 Parents: c4248c7 992eff2 Author: Brandon Williams <[email protected]> Authored: Fri May 23 14:09:18 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri May 23 14:09:18 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/UserTypes.java | 16 +++----- .../apache/cassandra/db/marshal/UserType.java | 39 ++++++++++++++------ .../cassandra/metrics/FileCacheMetrics.java | 10 +++-- 4 files changed, 40 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b49af0b/CHANGES.txt ----------------------------------------------------------------------
