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/aa41b6d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa41b6d0
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c6ad65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c6ad65
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 108f3de9b -> 51d7aaada
Dont propagate exception in sstableexpiredblockers
Patch by marcuse; reviewed by brandonwilliams for CASSANDRA-10240
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 acdbdc28c -> c2eb7bd7d
Dont propagate exception in sstableexpiredblockers
Patch by marcuse; reviewed by brandonwilliams for CASSANDRA-10240
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c6ad65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c6ad65
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53359607
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53359607
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 a7895cfb2 -> f6695884e
Dont propagate exception in sstableexpiredblockers
Patch by marcuse; reviewed by brandonwilliams for CASSANDRA-10240
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c6ad65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c6ad65
Diff:
Properly deserialize PrepareMessage for global repairs
Patch by marcuse; reviewed by yukim for CASSANDRA-10265
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dae2045f
Tree: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6695884
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6695884
Diff:
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2eb7bd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2eb7bd7
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6695884
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6695884
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 5bc56c3e4 -> 0bb32f0b6
Dont propagate exception in sstableexpiredblockers
Patch by marcuse; reviewed by brandonwilliams for CASSANDRA-10240
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2eb7bd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2eb7bd7
Diff:
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/78dcf79c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78dcf79c
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 44e19947f -> 9c0262529
Remove unnessary use of streams in IndexTransaction implementations.
Patch by Sam Tunnicliffe; reviewed by marcuse for CASSANDRA-10218
Project: http://git-wip-us.apache.org/repos/asf/cassandra/r
Repository: cassandra
Updated Branches:
refs/heads/trunk 1b60ffd89 -> 78dcf79c7
Remove unnessary use of streams in IndexTransaction implementations.
Patch by Sam Tunnicliffe; reviewed by marcuse for CASSANDRA-10218
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: h
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 83248186a -> 9f0509ee3
Fix sstable selection when anticompacting
Patch by Marcus Olsson; reviewed by marcuse for CASSANDRA-10299
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Repository: cassandra
Updated Branches:
refs/heads/trunk c18ab3857 -> 55b6e8a07
Fix sstable selection when anticompacting
Patch by Marcus Olsson; reviewed by marcuse for CASSANDRA-10299
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/re
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/55b6e8a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55b6e8a0
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 acc08aeca -> 9dd847135
Fix sstable selection when anticompacting
Patch by Marcus Olsson; reviewed by marcuse for CASSANDRA-10299
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f0509ee
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 b22ad4210 -> 362da9bbc
Fix sstable selection when anticompacting
Patch by Marcus Olsson; reviewed by marcuse for CASSANDRA-10299
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f0509ee
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 b2b756013 -> 813eb2357
Cancel the transaction for sstables that we wont redistribute index summary for.
Patch by marcuse; reviewed by benedict for CASSANDRA-10270
Project: http://git-wip-us.apache.org/repos/asf/cassandra/r
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d996c36c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d996c36c
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 55fb5cdf1 -> d996c36c3
Cancel the transaction for sstables that we wont redistribute index summary for.
Patch by marcuse; reviewed by benedict for CASSANDRA-10270
Project: http://git-wip-us.apache.org/repos/asf/cassandra/r
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/33152d83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33152d83
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d996c36c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d996c36c
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk be7eb4a07 -> 33152d83c
Cancel the transaction for sstables that we wont redistribute index summary for.
Patch by marcuse; reviewed by benedict for CASSANDRA-10270
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
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/37011705
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37011705
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk f1e45028d -> 370117050
Update compaction progress when getting the next partition, not row
Patch by marcuse; reviewed by tjake for CASSANDRA-10427
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 80355a105 -> 4bb56c4f3
Update compaction progress when getting the next partition, not row
Patch by marcuse; reviewed by tjake for CASSANDRA-10427
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: h
Readd the per row compactionstats progress update
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1b04c49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1b04c49
Diff:
bump verion
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae9b7e05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae9b7e05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae9b7e05
Branch:
Repository: cassandra
Updated Branches:
refs/heads/trunk 370117050 -> 2d2f55f2f
bump version
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78f2e7aa
Tree:
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/2d2f55f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d2f55f2
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05183725
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05183725
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/75038159
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75038159
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 750381598 -> a1b04c49e
Readd the per row compactionstats progress update
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1b04c49
Tree:
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52d5eb04
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52d5eb04
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 fd5cb43da -> d1a596a4a
Fix issue with data dir migration on upgrade
Patch by Stefania; reviewed by marcuse for CASSANDRA-10788
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1a596a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1a596a4
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 220f253fb -> 52d5eb04f
Fix issue with data dir migration on upgrade
Patch by Stefania; reviewed by marcuse for CASSANDRA-10788
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/re
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1a596a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1a596a4
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 1e978df3a -> d0da9e761
Fix issue with data dir migration on upgrade
Patch by Stefania; reviewed by marcuse for CASSANDRA-10788
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5ba69a325 -> dbfeeac17
Optimize the way we check if a token is repaired in anticompaction
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-10768
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f19dd4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f19dd4e
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f19dd4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f19dd4e
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f19dd4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f19dd4e
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad84add7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad84add7
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 f7aaea013 -> ad84add72
Optimize the way we check if a token is repaired in anticompaction
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-10768
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 a320737b1 -> 9f19dd4e4
Optimize the way we check if a token is repaired in anticompaction
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-10768
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f19dd4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f19dd4e
Diff:
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02492f7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02492f7b
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad84add7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad84add7
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 6bf1f75f5 -> ca70561f2
Optimize the way we check if a token is repaired in anticompaction
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-10768
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: h
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad84add7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad84add7
Diff:
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca70561f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca70561f
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 4c6f32569 -> 02492f7bc
Optimize the way we check if a token is repaired in anticompaction
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-10768
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02492f7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02492f7b
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 51753263a -> 0b26ca687
Avoid writing range tombstones after END_OF_ROW marker.
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-10791
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 29ed6fe2e -> 882df8a21
Avoid writing range tombstones after END_OF_ROW marker.
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-10791
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/882df8a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/882df8a2
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 04e5f5d96 -> 51464631c
Avoid writing range tombstones after END_OF_ROW marker.
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-10791
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b97fa110
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b97fa110
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/882df8a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/882df8a2
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 b950c3801 -> bb6973a6f
Avoid writing range tombstones after END_OF_ROW marker.
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-10791
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51464631
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51464631
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 38eaf7f10 -> b97fa1101
Avoid writing range tombstones after END_OF_ROW marker.
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-10791
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb6973a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb6973a6
Diff:
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b97fa110
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b97fa110
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/882df8a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/882df8a2
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb6973a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb6973a6
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb6973a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb6973a6
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/882df8a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/882df8a2
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 105ccb3d2 -> 2cd18ef5a
Add compressor name in the output of sstablemetadata
Patch by Nicolas Lalevee; reviewed by marcuse for CASSANDRA-9879
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Repository: cassandra
Updated Branches:
refs/heads/trunk 2cd18ef5a -> 3f79c5baa
Allow cancellation of index summary redistribution
Patch by Carl Yeksigian; reviewed by marcuse for CASSANDRA-8805
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1667494
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1667494
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 95dab2730 -> fc7075a41
Allow cancellation of index summary redistribution
Patch by Carl Yeksigian; reviewed by marcuse for CASSANDRA-8805
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65885e7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65885e7f
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 b55523e97 -> 65885e7fc
Allow cancellation of index summary redistribution
Patch by Carl Yeksigian; reviewed by marcuse for CASSANDRA-8805
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 7dd6b7de2 -> f16674949
Allow cancellation of index summary redistribution
Patch by Carl Yeksigian; reviewed by marcuse for CASSANDRA-8805
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-
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/3f79c5ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f79c5ba
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1667494
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1667494
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1667494
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1667494
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65885e7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65885e7f
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85c72418
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85c72418
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db40ef83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db40ef83
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 71bac92cf -> db40ef839
Allow CREATE TABLE WITH ID
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-9179
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 9b30d6572 -> cee35e42d
Allow CREATE TABLE WITH ID
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-9179
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85c72418
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85c72418
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 263763ab9 -> 85c724183
Allow CREATE TABLE WITH ID
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-9179
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85c72418
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85c72418
Diff:
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db40ef83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db40ef83
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk e5db3f2b1 -> d5f1175f3
Allow CREATE TABLE WITH ID
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-9179
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassan
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/d5f1175f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5f1175f
Diff:
1001 - 1100 of 2498 matches
Mail list logo