Updated Branches: refs/heads/trunk ef379f280 -> f8f80d3e5
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8f80d3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8f80d3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8f80d3e Branch: refs/heads/trunk Commit: f8f80d3e5058b7920ecb598d0b8a0ef2ccb3edf6 Parents: ef379f2 fc416fa Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Dec 7 10:14:16 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Dec 7 10:14:16 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/config/CFMetaData.java | 52 +++++---- src/java/org/apache/cassandra/db/RowMutation.java | 2 +- .../org/apache/cassandra/db/marshal/UUIDType.java | 2 +- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 14 +-- .../cassandra/service/AntiEntropyService.java | 2 +- .../apache/cassandra/service/MigrationManager.java | 2 + .../cassandra/streaming/StreamInSession.java | 2 +- .../cassandra/streaming/StreamOutSession.java | 2 +- .../cassandra/streaming/StreamingRepairTask.java | 2 +- .../apache/cassandra/thrift/CassandraServer.java | 2 +- .../org/apache/cassandra/tracing/TraceState.java | 2 +- .../transport/messages/ExecuteMessage.java | 2 +- .../transport/messages/PrepareMessage.java | 2 +- .../cassandra/transport/messages/QueryMessage.java | 2 +- src/java/org/apache/cassandra/utils/CounterId.java | 2 +- .../org/apache/cassandra/utils/FBUtilities.java | 21 +++ src/java/org/apache/cassandra/utils/UUIDGen.java | 99 +++++++-------- .../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 2 +- .../cassandra/db/marshal/CompositeTypeTest.java | 2 +- .../db/marshal/DynamicCompositeTypeTest.java | 2 +- .../apache/cassandra/db/marshal/RoundTripTest.java | 4 +- .../cassandra/db/marshal/TimeUUIDTypeTest.java | 14 +- .../apache/cassandra/db/marshal/UUIDTypeTest.java | 31 ++---- .../cassandra/io/LazilyCompactedRowTest.java | 2 +- .../cassandra/streaming/SerializationsTest.java | 6 +- .../unit/org/apache/cassandra/utils/UUIDTests.java | 14 +- .../cassandra/stress/operations/CqlInserter.java | 2 +- .../apache/cassandra/stress/util/Operation.java | 2 +- 29 files changed, 148 insertions(+), 147 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8f80d3e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8f80d3e/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8f80d3e/src/java/org/apache/cassandra/db/RowMutation.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8f80d3e/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8f80d3e/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8f80d3e/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8f80d3e/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8f80d3e/test/unit/org/apache/cassandra/streaming/SerializationsTest.java ----------------------------------------------------------------------
