Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca037b08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca037b08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca037b08 Branch: refs/heads/trunk Commit: ca037b08e8fade6d34cd16d42dfa759de86eb1f1 Parents: 583d98b 2be4241 Author: Jonathan Ellis <[email protected]> Authored: Fri Aug 30 13:55:47 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Aug 30 13:55:47 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + lib/licenses/metrics-core-2.0.3.txt | 202 ------------------------------- lib/licenses/metrics-core-2.2.0.txt | 202 +++++++++++++++++++++++++++++++ lib/metrics-core-2.0.3.jar | Bin 80800 -> 0 bytes lib/metrics-core-2.2.0.jar | Bin 0 -> 82123 bytes 5 files changed, 204 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca037b08/CHANGES.txt ----------------------------------------------------------------------
