cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Fri, 07 Dec 2012 09:14:03 GMT
Updated Branches:
  refs/heads/cassandra-1.2 8c1683345 -> fc416fab0


Merge branch 'cassandra-1.2.0' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc416fab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc416fab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc416fab

Branch: refs/heads/cassandra-1.2
Commit: fc416fab0b21db5d9c9a14fb99f7c139cec64247
Parents: 8c16833 bac9794
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Dec 7 10:13:43 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Dec 7 10:13:43 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/fc416fab/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc416fab/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc416fab/tools/stress/src/org/apache/cassandra/stress/util/Operation.java
----------------------------------------------------------------------


Mime
View raw message