Switch word count to M3P. Patch by brandonwilliams reviewed by yukim
for CASSANDRA-4975
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f31c5304
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f31c5304
Switch word count to M3P. Patch by brandonwilliams reviewed by yukim
for CASSANDRA-4975
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f31c5304
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f31c5304
Backport 4645 to 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/763305b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/763305b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/763305b4
Updated Branches:
refs/heads/cassandra-1.1 37067495c - 32135741b
refs/heads/cassandra-1.2 2721958a4 - 1d82d190f
refs/heads/cassandra-1.2.0 b86f75dcd - 08024b3ad
refs/heads/trunk 6a5c9ed87 - 805d02808
Merge branch 'cassandra-1.2' into trunk
Project:
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d82d190
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d82d190
Diff:
Merge branch 'cassandra-1.2.0' into cassandra-1.2
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/35b72712
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35b72712
Diff:
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d82d190
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d82d190
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2.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/08024b3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08024b3a
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2.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/08024b3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08024b3a
Diff:
update changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32135741
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32135741
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32135741
update changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32135741
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32135741
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32135741
Merge branch 'cassandra-1.1' into cassandra-1.2.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/08024b3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08024b3a
Diff:
RangeStreamer throws when any range did not complete.
Patch by brandonwilliams reviewed by yukim for CASSANDRA-5009
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1d37203
Tree: http://git-wip-us.apache.org/repos/asf
RangeStreamer throws when any range did not complete.
Patch by brandonwilliams reviewed by yukim for CASSANDRA-5009
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1d37203
Tree: http://git-wip-us.apache.org/repos/asf
RangeStreamer throws when any range did not complete.
Patch by brandonwilliams reviewed by yukim for CASSANDRA-5009
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1d37203
Tree: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/dht/RangeStreamer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d42e3b68
Tree:
Merge branch 'cassandra-1.2.0' into cassandra-1.2
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/35b72712
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35b72712
Diff:
update changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32135741
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32135741
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32135741
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/dht/RangeStreamer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d42e3b68
Tree:
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/dht/RangeStreamer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d42e3b68
Tree:
RangeStreamer throws when any range did not complete.
Patch by brandonwilliams reviewed by yukim for CASSANDRA-5009
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1d37203
Tree: http://git-wip-us.apache.org/repos/asf
update changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32135741
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32135741
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32135741
Change version to 1.2.0-beta3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b86f75dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b86f75dc
Diff:
Change version to 1.2.0-beta3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b86f75dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b86f75dc
Diff:
Remove obsolete test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91f36f6d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91f36f6d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91f36f6d
Remove obsolete test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91f36f6d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91f36f6d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91f36f6d
Remove obsolete test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91f36f6d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91f36f6d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91f36f6d
Updated Branches:
refs/heads/cassandra-1.1 2e271233f - 5abeecc8b
refs/heads/cassandra-1.2 6e61c4cdd - 52a650ea7
refs/heads/cassandra-1.2.0 5a90123eb - 2f3b5bfb2
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c83388
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c83388
Diff:
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for
CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f3b5bfb
Tree: http://git
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for
CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f3b5bfb
Tree: http://git
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c83388
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c83388
Diff:
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5abeecc8
Tree: http://git
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5abeecc8
Tree: http://git
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5abeecc8
Tree: http://git
ninja fix for crc_check_chance validation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a90123e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a90123e
Diff:
Updated Branches:
refs/heads/trunk c533b8885 - 7ec4f5a6e
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for
CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6d4151e
Tree: http://git
ninja fix for crc_check_chance validation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54ab2d2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54ab2d2c
Diff:
fix typo
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a41b7806
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a41b7806
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a41b7806
Branch:
fix typo
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a41b7806
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a41b7806
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a41b7806
Branch:
fix typo
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a41b7806
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a41b7806
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a41b7806
Branch:
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52a650ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52a650ea
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c83388
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c83388
Diff:
ninja fix for crc_check_chance validation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a90123e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a90123e
Diff:
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5abeecc8
Tree: http://git
Allow overriding available processors with
-Dcassandra.available_processors
Patch by brandonwilliams, reviewed by iamaleksey for
CASSANDRA-4790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f3b5bfb
Tree: http://git
r/m unused SSLTransportFactory.java (CustomTThreadPoolServer uses
TSSLTransportFactory directly)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e61c4cd
Tree:
Updated Branches:
refs/heads/trunk 94e37b4e4 - 989dd44c0
Fix merge wonkiness.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/989dd44c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/989dd44c
Diff:
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12948f65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12948f65
Diff:
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12948f65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12948f65
Diff:
Load host_ids when adding saved endpoints
Patch by brandonwilliams, reviewed by tjake for CASSANDRA-5032
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7322f823
Tree: http://git-wip-us.apache.org/repos/asf/cassandra
Updated Branches:
refs/heads/cassandra-1.2 4154434cf - 12948f652
refs/heads/cassandra-1.2.0 a90b310e6 - 7322f8238
refs/heads/trunk 7fdd4ccbd - fa9c54ef6
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Load host_ids when adding saved endpoints
Patch by brandonwilliams, reviewed by tjake for CASSANDRA-5032
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7322f823
Tree: http://git-wip-us.apache.org/repos/asf/cassandra
Load host_ids when adding saved endpoints
Patch by brandonwilliams, reviewed by tjake for CASSANDRA-5032
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7322f823
Tree: http://git-wip-us.apache.org/repos/asf/cassandra
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf3cde3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf3cde3d
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/service/MigrationManager.java
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf3cde3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf3cde3d
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/service/MigrationManager.java
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
ninja relocate crc_check_chance removal from options list
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b49ca58b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b49ca58b
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/service/MigrationManager.java
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Fix for IndexHelper.IndexFor OOB Exception
Patch by tjake; reviewed by jbellis for CASSANDRA-5030
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f91001a0
Tree:
Pull schema immediately when bootstrapping.
Patch by Chris Herron and brandonwilliams, reviewed by jbellis for
CASSANDRA-5025
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/442a7b3a
Tree: http://git-wip-us.apache.org
Fix for IndexHelper.IndexFor OOB Exception
Patch by tjake; reviewed by jbellis for CASSANDRA-5030
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f91001a0
Tree:
ninja relocate crc_check_chance removal from options list
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/248d6266
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/248d6266
Diff:
Pull schema immediately when bootstrapping.
Patch by Chris Herron and brandonwilliams, reviewed by jbellis for
CASSANDRA-5025
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/442a7b3a
Tree: http://git-wip-us.apache.org
Pull schema immediately when bootstrapping.
Patch by Chris Herron and brandonwilliams, reviewed by jbellis for
CASSANDRA-5025
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/442a7b3a
Tree: http://git-wip-us.apache.org
ninja relocate crc_check_chance removal from options list
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/248d6266
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/248d6266
Diff:
Updated Branches:
refs/heads/cassandra-1.2 b49ca58b2 - cf3cde3d9
refs/heads/cassandra-1.2.0 f91001a08 - 44545d380
refs/heads/trunk 5a7943da4 - 40dad0aea
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/cassandra-1.1 1ac90589e - c9ce1f011
Pull schema immediately when bootstrapping.
Patch by Chris Herron and brandonwilliams, reviewed by jbellis for
CASSANDRA-5025
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org
Merge branch 'cassandra-1.2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/cassandra-1.1 f618369f3 - 5e4629793
refs/heads/cassandra-1.2 bdf9c2a91 - 2828d28eb
refs/heads/cassandra-1.2.0 d599b3fc8 - fbf9f5533
refs/heads/trunk ff249316b - 36389f7d8
Cleanup from 5025, allow recovering nodes to pull immediately
Project:
Merge branch 'cassandra-1.2' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2828d28e
Tree:
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/service/MigrationManager.java
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Cleanup from 5025, allow recovering nodes to pull immediately
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e462979
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e462979
Diff:
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/service/MigrationManager.java
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Cleanup from 5025, allow recovering nodes to pull immediately
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec7a5f10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec7a5f10
Diff:
Merge branch 'cassandra-1.2.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/trunk a5c5f0a77 - b241bcd08
Fix broken build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b241bcd0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b241bcd0
Diff:
Updated Branches:
refs/heads/cassandra-1.1 8a3b29174 - 49cb6901b
Fix misspelling of 'positives'
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49cb6901
Tree:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1df03b36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1df03b36
Diff:
Updated Branches:
refs/heads/cassandra-1.2 b8d88023a - 1df03b36d
refs/heads/trunk c2812f38a - 5b0b1960d
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/5b0b1960
Tree:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1df03b36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1df03b36
Diff:
Fix misspelling of 'positives'
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49cb6901
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49cb6901
Diff:
Fix misspelling of 'positives'
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49cb6901
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49cb6901
Diff:
Fix MoveTest.
Patch by Liu Yu, reviewed by brandonwilliams for CASSANDRA-4564
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1206f3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1206f3b
Diff: http
Fix MoveTest.
Patch by Liu Yu, reviewed by brandonwilliams for CASSANDRA-4564
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1206f3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1206f3b
Diff: http
Updated Branches:
refs/heads/cassandra-1.1 49cb6901b - e1206f3b8
refs/heads/cassandra-1.2 1df03b36d - 9342dddc5
refs/heads/trunk 5b0b1960d - 0fb9da6fc
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9342dddc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9342dddc
Diff:
Fix MoveTest.
Patch by Liu Yu, reviewed by brandonwilliams for CASSANDRA-4564
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1206f3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1206f3b
Diff: http
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9342dddc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9342dddc
Diff:
Update pig readme for m3p
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4993d427
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4993d427
Diff:
Update pig readme for m3p
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4993d427
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4993d427
Diff:
Updated Branches:
refs/heads/cassandra-1.2 9342dddc5 - 4993d427b
refs/heads/trunk 0fb9da6fc - 736b2a8e8
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/736b2a8e
Tree:
Updated Branches:
refs/heads/cassandra-1.1 e1206f3b8 - 3034eeecb
Correctly decode row keys in widerow mode.
Patch by brandonwilliams reviewed by aleksey for CASSANDRA-5098
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra
Correctly decode row keys in widerow mode.
Patch by brandonwilliams reviewed by aleksey for CASSANDRA-5098
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/607dd90c
Tree: http://git-wip-us.apache.org/repos/asf
Merge
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/677e247b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/677e247b
Diff:
Updated Branches:
refs/heads/cassandra-1.2 3411adfdd - 677e247bb
refs/heads/trunk b41fc772e - acf306227
fix changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acf30622
Tree:
fix changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfb3d939
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfb3d939
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfb3d939
Branch:
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4ef4ab3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4ef4ab3
Diff:
401 - 500 of 5570 matches
Mail list logo