cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 11 Sep 2015 17:05:48 GMT
Merge branch 'cassandra-3.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/86079004
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86079004
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86079004

Branch: refs/heads/trunk
Commit: 86079004548b73565186f367ce6eda865fd00afd
Parents: a3c2d14 0790e48
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Fri Sep 11 18:04:21 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Fri Sep 11 18:04:21 2015 +0100

----------------------------------------------------------------------
 ...ore-3.0.0-alpha2-ae1e256-SNAPSHOT-shaded.jar | Bin 2209194 -> 0 bytes
 ...ore-3.0.0-alpha3-55db84c-SNAPSHOT-shaded.jar | Bin 0 -> 2209303 bytes
 ...iver-internal-only-3.0.0a1.post0-807aaa6.zip | Bin 201064 -> 0 bytes
 ...iver-internal-only-3.0.0a2.post0-2429ba3.zip | Bin 0 -> 229078 bytes
 .../org/apache/cassandra/config/CFMetaData.java |  18 ++--
 .../cassandra/config/ColumnDefinition.java      |  93 ++++++++++---------
 src/java/org/apache/cassandra/db/Columns.java   |   9 +-
 .../cassandra/schema/LegacySchemaMigrator.java  |   4 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |  26 +++---
 .../cassandra/thrift/ThriftConversion.java      |  10 +-
 .../utils/NativeSSTableLoaderClient.java        |  14 +--
 .../unit/org/apache/cassandra/SchemaLoader.java |   4 +-
 .../org/apache/cassandra/db/ColumnsTest.java    |  13 +--
 13 files changed, 94 insertions(+), 97 deletions(-)
----------------------------------------------------------------------



Mime
View raw message