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/d7d7db93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7d7db93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7d7db93 Branch: refs/heads/trunk Commit: d7d7db934085566acbd6f15fda3ccab324ab51c0 Parents: 4f0924c ed67154 Author: Robert Stupp <sn...@snazy.de> Authored: Sun Sep 13 14:15:25 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Sun Sep 13 14:15:25 2015 +0200 ---------------------------------------------------------------------- .../legacy_ma_clust/ma-1-big-CompressionInfo.db | Bin 83 -> 83 bytes .../legacy_ma_clust/ma-1-big-Data.db | Bin 5032 -> 5045 bytes .../legacy_ma_clust/ma-1-big-Digest.crc32 | 2 +- .../legacy_ma_clust/ma-1-big-Statistics.db | Bin 7045 -> 7045 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 4427 -> 4447 bytes .../ma-1-big-Digest.crc32 | 2 +- .../ma-1-big-Statistics.db | Bin 7054 -> 7054 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 -> 4598 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 -> 4607 bytes .../legacy_ma_simple_counter/ma-1-big-TOC.txt | 8 ++++---- 18 files changed, 20 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
