10089 - 3.0 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a90e989
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a90e989
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a90e989
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/7d6dbf89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d6dbf89
Diff:
10089 - 2.2 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bb6bb00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bb6bb00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bb6bb00
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/87fe1e09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87fe1e09
Diff:
10089 - 3.0 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a90e989
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a90e989
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a90e989
10089 - 3.0 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a90e989
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a90e989
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a90e989
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/87fe1e09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87fe1e09
Diff:
Fix NPE in Gossip handleStateNormal
Patch by stefania; reviewed by jknighton for CASSANDRA-10089
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bad57fc
Tree:
10089 - 2.2 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bb6bb00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bb6bb00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bb6bb00
Fix NPE in Gossip handleStateNormal
Patch by stefania; reviewed by jknighton for CASSANDRA-10089
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bad57fc
Tree:
10089 - 2.2 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bb6bb00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bb6bb00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bb6bb00
10089 - 2.2 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bb6bb00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bb6bb00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bb6bb00
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3674ad9da -> 6bad57fc3
refs/heads/cassandra-2.2 9fc957cf3 -> 6bb6bb005
refs/heads/cassandra-3.0 49c9c01f5 -> 9a90e9894
refs/heads/cassandra-3.1 6f7b38987 -> 1fe90d34b
refs/heads/trunk 55811e561 -> 7d6dbf897
Fix NPE in
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/1fe90d34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fe90d34
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/1fe90d34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fe90d34
Diff:
Fix NPE in Gossip handleStateNormal
Patch by stefania; reviewed by jknighton for CASSANDRA-10089
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bad57fc
Tree:
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/87fe1e09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87fe1e09
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/87fe1e09
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87fe1e09
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 cb429063c -> f8783b7bb
refs/heads/cassandra-3.0 39bc5de68 -> 97dc8d525
refs/heads/trunk 33f5dc578 -> a2c14f852
Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.
Patch by jmckenzie;
Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10641
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8783b7b
Tree: 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/97dc8d52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97dc8d52
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/97dc8d52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97dc8d52
Diff:
Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired.
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10641
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8783b7b
Tree: 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/a2c14f85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2c14f85
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/5f5e9602
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f5e9602
Diff:
Add -a option to skip TIME_WAIT port check on Windows startup
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78753263
Tree: http://git-wip-us.apache.org
Revert 7486, make CMS default GC, move gc opts to conf/jvm.options
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10403
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1415fa51
Tree: http://git-wip
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 25366f7d4 -> 78753263e
refs/heads/cassandra-3.0 1415fa512 -> 5f5e9602d
refs/heads/trunk d4a297640 -> d87aab987
Add -a option to skip TIME_WAIT port check on Windows startup
Patch by jmckenzie; reviewed by
Add -a option to skip TIME_WAIT port check on Windows startup
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78753263
Tree: http://git-wip-us.apache.org
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/d87aab98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d87aab98
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/5f5e9602
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f5e9602
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 ebb2b1bed -> 1415fa512
refs/heads/trunk bcd921c3c -> d4a297640
Revert 7486, make CMS default GC, move gc opts to conf/jvm.options
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10403
Project: http://g
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/d4a29764
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4a29764
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 3cd750012 -> 728f94e79
refs/heads/cassandra-3.0 7159a754a -> fa909cc42
refs/heads/trunk c0c513b64 -> a9060f033
Make Windows -a startup skip VerifyPorts check entirely
Patch by jmckenzie; reviewed by pthompson for
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/a9060f03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9060f03
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/f807b8c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f807b8c6
Diff:
Fix MAX_HEAP_SIZE check on Windows startup
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10553
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa909cc4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra
Fix MAX_HEAP_SIZE check on Windows startup
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10553
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa909cc4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra
Make Windows -a startup skip VerifyPorts check entirely
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/728f94e7
Tree: http://git-wip-us.apache.org/repos
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/f807b8c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f807b8c6
Diff:
Make Windows -a startup skip VerifyPorts check entirely
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/728f94e7
Tree: http://git-wip-us.apache.org/repos
Repository: cassandra
Updated Branches:
refs/heads/trunk e017d89a6 -> 881e2da0a
Fix ReadCommandTest
Patch by jjirsa; reviewed by stefania for CASSANDRA-10555
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
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/2a127138
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a127138
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/d404362a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d404362a
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
test/unit/org/apache/cassandra/db/HintedHandOffTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f021823
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 582b66fbd -> e291382fd
refs/heads/cassandra-2.2 bfbcca1bf -> 9f021823f
refs/heads/cassandra-3.0 79bf03d4e -> ed424bdd6
refs/heads/cassandra-3.1 421c41d57 -> d404362ad
refs/heads/trunk ee06e78bb -> 9c5bdb261
Fix missing
Fix missing host ID on hinted handoff write
Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e291382f
Tree:
10485-3.0 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed424bdd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed424bdd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed424bdd
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/d404362a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d404362a
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
test/unit/org/apache/cassandra/db/HintedHandOffTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f021823
Tree:
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
test/unit/org/apache/cassandra/db/HintedHandOffTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f021823
Tree:
Fix missing host ID on hinted handoff write
Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e291382f
Tree:
10485-3.0 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed424bdd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed424bdd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed424bdd
Fix missing host ID on hinted handoff write
Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e291382f
Tree:
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
test/unit/org/apache/cassandra/db/HintedHandOffTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f021823
Tree:
10485-3.0 patch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed424bdd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed424bdd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed424bdd
Fix missing host ID on hinted handoff write
Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e291382f
Tree:
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/2a127138
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a127138
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/9c5bdb26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c5bdb26
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/2a127138
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a127138
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/bfbcca1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfbcca1b
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/421c41d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/421c41d5
Diff:
Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/582b66fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/582b66fb
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/bfbcca1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfbcca1b
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/421c41d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/421c41d5
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/79bf03d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79bf03d4
Diff:
Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/582b66fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/582b66fb
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/79bf03d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79bf03d4
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/79bf03d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79bf03d4
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/bfbcca1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfbcca1b
Diff:
Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/582b66fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/582b66fb
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/ee06e78b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee06e78b
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 ecd66de2b -> 582b66fbd
refs/heads/cassandra-2.2 b05fe4ffe -> bfbcca1bf
refs/heads/cassandra-3.0 464f8f076 -> 79bf03d4e
refs/heads/cassandra-3.1 6688911f4 -> 421c41d57
refs/heads/trunk 0781bccc9 -> ee06e78bb
Follow up to
Follow up to 10089 - fix possible NPE in Gossiper.getStateForVersionBiggerThan
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/582b66fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/582b66fb
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/bfbcca1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfbcca1b
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 012de8bed - 7ab241e96
Fix race on StorageService.doAuthSetup
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10104
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 bb77e12f0 - 88b05ef4b
Fix race on StorageService.doAuthSetup
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10104
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos
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/7ab241e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ab241e9
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 196b7ab54 - c73ec67c0
Ignore FSWriteError in recover() during resetUnsafe() on Windows
Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9414
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/b9b1ec80
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9b1ec80
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/c73ec67c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c73ec67c
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/c73ec67c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c73ec67c
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk c9a324153 - b9b1ec803
Ignore FSWriteError in recover() during resetUnsafe() on Windows
Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9414
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 5fb4e58bc - c5158e53e
Ignore FSWriteError in recover() during resetUnsafe() on Windows
Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9414
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/0d2603cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d2603cf
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 17f8788ef -> 0d2603cf9
ninja: remove vestigial log4j from cassandra-env.ps1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3effec53
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 b58686858 -> 45eba1adb
ninja: remove vestigial log4j from cassandra-env.ps1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3effec53
Tree:
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
conf/cassandra-env.ps1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45eba1ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45eba1ad
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 0a4ce4449 -> 3effec53e
ninja: remove vestigial log4j from cassandra-env.ps1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3effec53
Tree:
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
conf/cassandra-env.ps1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45eba1ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45eba1ad
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 f7644f265 -> e1fc0e067
Fix failure to start with space in directory name on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: h
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 66b0e1d78 -> e9c0e1787
Fix failure to start with space in directory name on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: h
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/e9c0e178
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9c0e178
Diff:
Fix failure to start with space in directory name on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1fc0e06
Tree: http://git-wip-us.apache.org
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/e9c0e178
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9c0e178
Diff:
Fix SSTableLoaderTest on Windows
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10210
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66b0e1d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree
Repository: cassandra
Updated Branches:
refs/heads/trunk 966bea74b -> 829b9b78c
Remove dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a86d221
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/829b9b78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/829b9b78
Diff:
3.0 patch for CASSANDRA-10222
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ebd5904
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ebd5904
Diff:
3.0 patch for CASSANDRA-10222
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ebd5904
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ebd5904
Diff:
501 - 600 of 1153 matches
Mail list logo