Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1f10f82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1f10f82
Diff:
Updated Branches:
refs/heads/trunk 4cda3622d - c1f10f823
changes.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9837173d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9837173d
Diff:
Updated Branches:
refs/heads/cassandra-1.2 110d283af - b7e13b89c
Gossiper.handleMajorStateChange can lose existing node ApplicationState
patch by jasobrown; reviewe4d by jbellis for CASSANDRA-5665
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
restore fetching global trace state in default .execute method
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8b96bdb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8b96bdb
Diff:
refactor reconnecting snitches
patch by jasobrown; reviewed by jbellis for CASSANDRA-5681
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ded233ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ded233ef
Updated Branches:
refs/heads/trunk 36aae612a - d99a6f2a2
Gossiper.handleMajorStateChange can lose existing node ApplicationState
patch by jasobrown; reviewe4d by jbellis for CASSANDRA-5665
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org
Updated Branches:
refs/heads/cassandra-1.2 362473fb3 - 043a63c63
ninja-remove an assert that is not really relevent (and now causing errors
due to refactor in CASSANDRA-5665)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/trunk 7fcdd8080 - 2feb81ead
ninja-remove an assert that is not really relevent (and now causing errors
due to refactor in CASSANDRA-5665)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2feb81ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2feb81ea
Diff:
Updated Branches:
refs/heads/cassandra-1.2 8d17ccb7b - b4dca4437
changes.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4dca443
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4dca443
Diff:
Updated Branches:
refs/heads/trunk 56a47b394 - 7bb6f012b
changes.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4dca443
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4dca443
Diff:
ITC.close() resets peer msg version, causes connection thrashing in ec2 during
upgrade.
Second pass, where we have Ec2MRS check that the perr node is on the same
MS.current_version before
closing connection on publicIP and reconnecting on privateIP
Project:
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bb6f012
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bb6f012
Diff:
ITC.close() resets peer msg version, causes connection thrashing in ec2 during
upgrade.
Second pass, where we have Ec2MRS check that the perr node is on the same
MS.current_version before
closing connection on publicIP and reconnecting on privateIP
Project:
Updated Branches:
refs/heads/cassandra-1.2 b4dca4437 - 998fe9676
Avoid over-reconnecting in EC2MRS
patch by jasobrown; reviewed by jbellis for CASSADNRA-5678
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8df9d1f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8df9d1f4
Diff:
Updated Branches:
refs/heads/trunk 7bb6f012b - 8df9d1f4c
Avoid over-reconnecting in EC2MRS
patch by jasobrown; reviewed by jbellis for CASSADNRA-5678
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/998fe967
Tree
Updated Branches:
refs/heads/cassandra-1.2 f932aa24b - 42be16fc8
ninja add toString() on gossip-related classes.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42be16fc
Tree:
Updated Branches:
refs/heads/trunk 0b2359959 - 1daa8e4fd
ninja add toString() on gossip-related classes.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42be16fc
Tree:
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1daa8e4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1daa8e4f
Diff:
Gossiper incorrectly drops AppState for an upgrading node
patch by jasobrown; reviewed by driftx for CASSANDRA-5660
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc5044f5
Tree: http://git-wip-us.apache.org/repos/asf
Updated Branches:
refs/heads/cassandra-1.2 5b525c1fc - fc5044f59
Gossiper.addSavedEndpoint() drops any info previously known about a node.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00126da7
Tree:
make TokenMetadata.relocatingTokens a ConcurrentMap
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5634
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b525c1f
Tree:
Updated Branches:
refs/heads/trunk 86081fa78 - 78b0dbeb2
Gossiper.addSavedEndpoint() drops any info previously known about a node.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00126da7
Tree:
Gossiper incorrectly drops AppState for an upgrading node
patch by jasobrown; reviewed by driftx for CASSANDRA-5660
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc5044f5
Tree: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78b0dbeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78b0dbeb
Diff:
Updated Branches:
refs/heads/cassandra-1.2 19d2782c7 - 2f72f8bc5
Add a rate limit option to stress
patch by jasobrown, reviewed by driftx for CASSANDRA-5004
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f72f8bc
Merge branch 'cassandra-1.2' into trunk
Conflicts:
tools/stress/src/org/apache/cassandra/stress/StressAction.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be0523a2
Tree:
Updated Branches:
refs/heads/trunk 22be25b89 - be0523a24
Add a rate limit option to stress
patch by jasobrown, reviewed by driftx for CASSANDRA-5004
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f72f8bc
Tree
Updated Branches:
refs/heads/trunk 34407424b - 01e79f5df
CASSANDRA-3734: native link via java7 (no jna)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01e79f5d
Tree:
Updated Branches:
refs/heads/trunk 01e79f5df - c1b87043b
Support native link w/o JNA in Java7
patch by jasobrown; reviewed by iamaleksey for CASSANDRA-3734
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1b87043
fix corrupt changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b4b143b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b4b143b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b4b143b
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
CHANGES.txt
build.xml
debian/changelog
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/cassandra-1.2 a89b21909 - 83ff1da82
updated for 1.1.11 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d939a0c9
Tree:
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2762f484
Tree: http://git-wip-us.apache.org/repos/asf
add 5393 to CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36f8a5d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36f8a5d8
Diff:
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2762f484
Tree: http://git-wip-us.apache.org/repos/asf
Updated Branches:
refs/heads/trunk a1c7c1321 - 56e59fefc
updated for 1.1.11 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d939a0c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d939a0c9
add 5393 to CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36f8a5d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36f8a5d8
Diff:
fix corrupt changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b4b143b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b4b143b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b4b143b
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56e59fef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e59fef
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
CHANGES.txt
build.xml
debian/changelog
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/cassandra-1.2 455a0fccf - 9fc071a39
Do not hard code the current Descriptor version into BootstrapTest.
patch by jasobrown; reviewed by Aleksey Yeschenko for CASSANDRA-5495
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
Updated Branches:
refs/heads/trunk 116d90761 - 29974346a
Do not hard code the current Descriptor version into BootstrapTest.
patch by jasobrown; reviewed by Aleksey Yeschenko for CASSANDRA-5495
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/io/sstable/Descriptor.java
test/unit/org/apache/cassandra/streaming/BootstrapTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/cassandra-1.1 3b4b143b6 - 2762f484c
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf
Updated Branches:
refs/heads/cassandra-1.1 2762f484c - 36f8a5d81
add 5393 to CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36f8a5d8
Tree:
Updated Branches:
refs/heads/cassandra-1.2 9fc071a39 - 262e006eb
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/317dca58
Tree:
Updated Branches:
refs/heads/trunk 29974346a - 317dca584
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra
Remove node from seeds list when it permanently leaves the cluster
patch by jasobrown; freviewed by driftx for CASSANDRA-5459.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7066f46
Tree: http://git-wip
Remove node from seeds list when it permanently leaves the cluster
patch by jasobrown; freviewed by driftx for CASSANDRA-5459.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7066f46
Tree: http://git-wip
Updated Branches:
refs/heads/trunk abbb8601e - 4c28cfb57
IndexHelper.skipBloomFilters won't skip non-SHA filters, part 2
patch by Carl Yeksigian; reviewed by jasobrown got CASSANDRA-5385
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos
Updated Branches:
refs/heads/cassandra-1.2 6a03b1103 - 213063399
IndexHelper.skipBloomFilters won't skip non-SHA filters (backport of patch2 to
cassandra-1.2)
path by Carl Yekisian; reviewed by jasobrown for CASSANDRA-5385
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Updated Branches:
refs/heads/cassandra-1.2 2156fb22e - 4f75875c2
IndexHelper.skipBloomFilters won't skip non-SHA filters
patch by Carl Yeksigian; reviewed by jasobrown for CASSANDRA-5385
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos
Updated Branches:
refs/heads/trunk 313c79a1d - ae1f7be73
IndexHelper.skipBloomFilters won't skip non-SHA filters
patch by Carl Yeksigian; reviewed by jasobrown for CASSANDRA-5385
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf
Merge remote-tracking branch 'apache/cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
test/unit/org/apache/cassandra/db/ScrubTest.java
Updated Branches:
refs/heads/trunk ffd7ee7c3 - 9297e7b71
Remove row-level bloom filters.
patch by Jason Brown; reviewed by Jonathan Ellis for CASSANRDA-4885
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9297e7b7
Updated Branches:
refs/heads/trunk 9297e7b71 - 772bacb18
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/772bacb1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/772bacb1
Diff:
901 - 959 of 959 matches
Mail list logo