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/4b8f667d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b8f667d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b8f667d Branch: refs/heads/trunk Commit: 4b8f667d047963882f5b4140267d2bab449a0aee Parents: 3cb7361 4ee3721 Author: Jake Luciani <j...@apache.org> Authored: Wed May 14 09:06:34 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Wed May 14 09:06:34 2014 -0400 ---------------------------------------------------------------------- build.properties.default | 1 - build.xml | 6 +- lib/high-scale-lib-1.0.5.jar | Bin 104776 -> 0 bytes lib/high-scale-lib-1.0.6.jar | Bin 0 -> 105118 bytes lib/licenses/high-scale-lib-1.0.6.txt | 29 +++++ lib/licenses/high-scale-lib-1.1.2.txt | 29 ----- .../composites/AbstractSimpleCellNameType.java | 2 +- .../cassandra/db/composites/SimpleCType.java | 4 +- .../cassandra/db/composites/CTypeTest.java | 123 +++++++++++++++++++ 9 files changed, 156 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b8f667d/build.xml ----------------------------------------------------------------------
