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/46c0a55e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46c0a55e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46c0a55e Branch: refs/heads/trunk Commit: 46c0a55ea5d2f1412de8a1134da8ae5bc34c3cb3 Parents: 0c3575f 1b823ec Author: Robert Stupp <sn...@snazy.de> Authored: Fri Sep 18 12:36:48 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Sep 18 12:36:48 2015 +0200 ---------------------------------------------------------------------- .../legacy_ma_clust/ma-1-big-CompressionInfo.db | Bin 83 -> 83 bytes .../legacy_ma_clust/ma-1-big-Data.db | Bin 5049 -> 5036 bytes .../legacy_ma_clust/ma-1-big-Digest.crc32 | 2 +- .../legacy_ma_clust/ma-1-big-Index.db | Bin 157553 -> 157553 bytes .../legacy_ma_clust/ma-1-big-Statistics.db | Bin 7045 -> 7048 bytes .../legacy_ma_clust/ma-1-big-TOC.txt | 8 ++++---- .../ma-1-big-CompressionInfo.db | Bin 75 -> 75 bytes .../legacy_ma_clust_counter/ma-1-big-Data.db | Bin 4393 -> 4344 bytes .../ma-1-big-Digest.crc32 | 2 +- .../legacy_ma_clust_counter/ma-1-big-Index.db | Bin 157553 -> 157553 bytes .../ma-1-big-Statistics.db | Bin 7054 -> 7057 bytes .../legacy_ma_clust_counter/ma-1-big-TOC.txt | 8 ++++---- .../legacy_ma_simple/ma-1-big-Data.db | Bin 85 -> 85 bytes .../legacy_ma_simple/ma-1-big-Digest.crc32 | 2 +- .../legacy_ma_simple/ma-1-big-Statistics.db | Bin 4598 -> 4601 bytes .../legacy_ma_simple/ma-1-big-TOC.txt | 8 ++++---- .../legacy_ma_simple_counter/ma-1-big-Data.db | Bin 106 -> 106 bytes .../ma-1-big-Digest.crc32 | 2 +- .../ma-1-big-Statistics.db | Bin 4607 -> 4610 bytes .../legacy_ma_simple_counter/ma-1-big-TOC.txt | 8 ++++---- 20 files changed, 20 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
