[1/8] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 f9d1f93f0 - 271405656 refs/heads/trunk 9ecda7230 - 02308f6f9 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02308f6f Tree:

[8/8] git commit: FIx cqlsh COPY FROM without explicit column names. Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4470

FIx cqlsh COPY FROM without explicit column names. Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4470 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80c3b2dc Tree:

[6/8] git commit: enable jamm for OpenJDK = 1.6.0.23 Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4447

enable jamm for OpenJDK = 1.6.0.23 Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4447 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1209c9e7 Tree:

[4/8] git commit: Update #4447 to be dash-compatible. Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4447

Update #4447 to be dash-compatible. Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4447 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9d1f93f Tree:

[1/2] git commit: fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466

Updated Branches: refs/heads/cassandra-1.0 4f0237acd - 8b6ce324b fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466 Project: http://git-wip-us.apache.org/repos/asf/cassandra

[2/2] git commit: formatting

formatting Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813553be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813553be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813553be Branch:

[2/3] git commit: formatting

formatting Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f556183 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f556183 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f556183 Branch:

[3/3] git commit: Update versions, news and changes for 1.0.11 release

Update versions, news and changes for 1.0.11 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a958f2a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a958f2a8 Diff:

[1/3] git commit: fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466

Updated Branches: refs/heads/cassandra-1.1 38e5cf73d - 953bcb345 fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466 Project: http://git-wip-us.apache.org/repos/asf/cassandra

[1/3] git commit: fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466

Updated Branches: refs/heads/trunk eed76ae9c - 738bd9e15 fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

[2/3] git commit: Update versions, news and changes for 1.0.11 release

Update versions, news and changes for 1.0.11 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/259be44a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/259be44a Diff:

[3/3] git commit: formatting

formatting Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f775e624 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f775e624 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f775e624 Branch:

[1/4] git commit: fix awaitTermination logic for streamExecutors patch by Christopher Porter; reviewed by jbellis for CASSANDRA-4484

Updated Branches: refs/heads/cassandra-1.1 94bcc6a6f - 8e6962f01 refs/heads/trunk 22fbc4e41 - afb2c00e5 fix awaitTermination logic for streamExecutors patch by Christopher Porter; reviewed by jbellis for CASSANDRA-4484 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

[4/4] git commit: add emptyVersion comment

add emptyVersion comment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/478248a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/478248a4 Diff:

[3/4] git commit: fix awaitTermination logic for streamExecutors patch by Christopher Porter; reviewed by jbellis for CASSANDRA-4484

fix awaitTermination logic for streamExecutors patch by Christopher Porter; reviewed by jbellis for CASSANDRA-4484 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e6962f0 Tree: http://git-wip-us.apache.org/repos/asf

[2/4] git commit: add emptyVersion comment

add emptyVersion comment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a6d9888 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a6d9888 Diff:

git commit: cqlsh: learn to tokenize [] and {} brackets

Updated Branches: refs/heads/trunk afb2c00e5 - 167da9551 cqlsh: learn to tokenize [] and {} brackets patch by Paul Cannon; reviewed by jbellis for CASSANDRA-4485 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

git commit: fix offline scrub to catch = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411

Updated Branches: refs/heads/cassandra-1.1 8e6962f01 - 115f380a8 fix offline scrub to catch = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf

git commit: fix offline scrub to catch = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411

Updated Branches: refs/heads/trunk dec5eedd3 - ce368f812 fix offline scrub to catch = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[1/7] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 115f380a8 - 9fb63a2f9 refs/heads/trunk ce368f812 - 8a290c1b7 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a290c1b Tree:

[2/7] git commit: more fixes to scrub catching = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411

more fixes to scrub catching = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fb63a2f Tree: http://git-wip-us.apache.org/repos/asf

[3/7] git commit: more fixes to scrub catching = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411

more fixes to scrub catching = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fb63a2f Tree: http://git-wip-us.apache.org/repos/asf

[6/7] git commit: add emptyVersion comment

add emptyVersion comment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/478248a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/478248a4 Diff:

[4/7] git commit: fix offline scrub to catch = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411

fix offline scrub to catch = out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/115f380a Tree: http://git-wip-us.apache.org/repos/asf

[5/7] git commit: fix awaitTermination logic for streamExecutors patch by Christopher Porter; reviewed by jbellis for CASSANDRA-4484

fix awaitTermination logic for streamExecutors patch by Christopher Porter; reviewed by jbellis for CASSANDRA-4484 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e6962f0 Tree: http://git-wip-us.apache.org/repos/asf

[7/7] git commit: Fix typo in jvm version comparison.

Fix typo in jvm version comparison. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94bcc6a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94bcc6a6 Diff:

[1/2] git commit: add #4494 to CHANGES

Updated Branches: refs/heads/cassandra-1.0 8b6ce324b - 197511f0b refs/heads/cassandra-1.1 9dc560812 - a201422b2 add #4494 to CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a201422b Tree:

[2/2] git commit: fix setting key length for old-style mapred api patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534

fix setting key length for old-style mapred api patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/197511f0 Tree: http://git-wip-us.apache.org/repos/asf

[3/14] git commit: merge from 1.0

merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17c1787e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17c1787e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17c1787e

[2/14] git commit: merge from 1.0

merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17c1787e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17c1787e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17c1787e

[1/14] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 a201422b2 - 17c1787e9 refs/heads/trunk e243db435 - 1a44fa7ea merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a44fa7e Tree:

[4/14] git commit: add #4494 to CHANGES

add #4494 to CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a201422b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a201422b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a201422b

[8/14] git commit: a startswith func that works for dash and bash

a startswith func that works for dash and bash Patch by eevans for CASSANDRA-4494 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/510689e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/510689e3 Diff:

[5/14] git commit: updated for 1.1.4 release

updated for 1.1.4 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dc56081 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dc56081 Diff:

[7/14] git commit: fix setting key length for old-style mapred api patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534

fix setting key length for old-style mapred api patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/197511f0 Tree: http://git-wip-us.apache.org/repos/asf

[9/14] git commit: fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466

fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[6/14] git commit: fix setting key length for old-style mapred api patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534

fix setting key length for old-style mapred api patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/197511f0 Tree: http://git-wip-us.apache.org/repos/asf

[12/14] git commit: formatting

formatting Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813553be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813553be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813553be Branch:

[13/14] git commit: Update versions, news and changes for 1.0.11 release

Update versions, news and changes for 1.0.11 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f0237ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f0237ac Diff:

[14/14] git commit: Update versions, news and changes for 1.0.11 release

Update versions, news and changes for 1.0.11 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f0237ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f0237ac Diff:

[11/14] git commit: formatting

formatting Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813553be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813553be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813553be Branch:

[10/14] git commit: fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466

fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit

[2/3] git commit: Support collections natively in the binary protocol patch by slebresne; reviewed by Paul Cannon for CASSANDRA-4453

Support collections natively in the binary protocol patch by slebresne; reviewed by Paul Cannon for CASSANDRA-4453 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba231f4e Tree:

[1/3] git commit: Use binary collection encoding for Thrift resultsets patch by slebresne; reviewed by Paul Cannon for CASSANDRA-4453

Updated Branches: refs/heads/trunk 1a44fa7ea - 6ce498f5a Use binary collection encoding for Thrift resultsets patch by slebresne; reviewed by Paul Cannon for CASSANDRA-4453 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[3/3] git commit: generify collection types patch by slebresnse; reviewed by Paul Cannon for CASSANDRA-4453

generify collection types patch by slebresnse; reviewed by Paul Cannon for CASSANDRA-4453 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e5fbc68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e5fbc68

[1/2] git commit: run local range scans on the read stage patch by jbellis; reviewed by vijay for CASSANDRA-3687

Updated Branches: refs/heads/trunk fe784f58e - 5577ff626 run local range scans on the read stage patch by jbellis; reviewed by vijay for CASSANDRA-3687 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5577ff62 Tree

[2/2] git commit: revert CASSANDRA-1337 comprising commits ef23335, f17fbac, 9cf915f.

revert CASSANDRA-1337 comprising commits ef23335, f17fbac, 9cf915f. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29fed1f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29fed1f1 Diff:

[3/5] git commit: simplify Map/Set usage patch by pjenvey; reviewed by jbellis

simplify Map/Set usage patch by pjenvey; reviewed by jbellis Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a343c85b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a343c85b Diff: http://git-wip

[5/5] git commit: remove spurious character

remove spurious character Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b1336f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b1336f0 Diff:

[2/5] git commit: simplify Map/Set usage patch by pjenvey; reviewed by jbellis

simplify Map/Set usage patch by pjenvey; reviewed by jbellis Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a343c85b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a343c85b Diff: http://git-wip

[4/5] git commit: fix build

fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1471750 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1471750 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1471750 Branch:

[1/5] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 8b1336f00 - a343c85b7 refs/heads/trunk 1124615a6 - f70945eaa Merge branch 'cassandra-1.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/f70945ea Tree:

git commit: make de/serializers agree to use a short length for index expression value patch by jbellis; reviewed by David Alves for CASSANDRA-4555

Updated Branches: refs/heads/trunk b25b12a0a - 9d2b26dac make de/serializers agree to use a short length for index expression value patch by jbellis; reviewed by David Alves for CASSANDRA-4555 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

[2/3] git commit: upgradesstables recommended for #4436

upgradesstables recommended for #4436 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5655d972 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5655d972 Diff:

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 7db46ef80 - 5655d9722 refs/heads/trunk 413a177df - dafcaeb06 Merge branch 'cassandra-1.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/dafcaeb0 Tree:

[3/3] git commit: upgradesstables recommended for #4436

upgradesstables recommended for #4436 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5655d972 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5655d972 Diff:

[2/4] git commit: bump java7 stack size to 180; see #4457

bump java7 stack size to 180; see #4457 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8173c6f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8173c6f6 Diff:

[4/4] git commit: change cache write progress check to cache type basis; patch by yukim, reviewed by jbellis for CASSANDRA-4533

change cache write progress check to cache type basis; patch by yukim, reviewed by jbellis for CASSANDRA-4533 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa81f84c Tree: http://git-wip-us.apache.org/repos/asf

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 aa81f84c3 - 8173c6f64 refs/heads/trunk e1fef7248 - 66d52f9d2 Merge branch 'cassandra-1.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/66d52f9d Tree:

[3/4] git commit: bump java7 stack size to 180; see #4457

bump java7 stack size to 180; see #4457 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8173c6f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8173c6f6 Diff:

git commit: add disk_failure_policy patch by Aleksey Yeschenko; reviewed by jbellis for CASSANDRA-2118

Updated Branches: refs/heads/trunk 58c5533e9 - 99605d9f8 add disk_failure_policy patch by Aleksey Yeschenko; reviewed by jbellis for CASSANDRA-2118 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99605d9f Tree

git commit: add src/java/org/apache/cassandra/db/BlacklistedDirectories.java

Updated Branches: refs/heads/trunk 99605d9f8 - 44f599866 add src/java/org/apache/cassandra/db/BlacklistedDirectories.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44f59986 Tree:

git commit: finish renaming DFMode - DFPolicy

Updated Branches: refs/heads/trunk 44f599866 - d9c70e1d3 finish renaming DFMode - DFPolicy Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9c70e1d Tree:

git commit: add DMP.ignore to avoid surprises when upgrading w/ old config file

Updated Branches: refs/heads/trunk d9c70e1d3 - e1ee63602 add DMP.ignore to avoid surprises when upgrading w/ old config file Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1ee6360 Tree:

git commit: parallelize row cache loading patch by jbellis; reviewed by vijay for CASSANDRA-4282

Updated Branches: refs/heads/trunk e1ee63602 - 08b309191 parallelize row cache loading patch by jbellis; reviewed by vijay for CASSANDRA-4282 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08b30919 Tree: http

[3/8] git commit: merge from 1.0

merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de039598 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de039598 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de039598

[4/8] git commit: fix toString of hint destination tokens patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568

fix toString of hint destination tokens patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4764a379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[1/8] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.0 ec76baf0d - 4764a379e refs/heads/cassandra-1.1 fa8fc22fc - de039598f refs/heads/trunk 08b309191 - f5c19e84a merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[5/8] git commit: fix toString of hint destination tokens patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568

fix toString of hint destination tokens patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4764a379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[7/8] git commit: merge from 1.0

merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa8fc22f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa8fc22f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa8fc22f

[8/8] git commit: Add missing String.format call to log string contents patch by Julien Lambert reviewed by dbrosius for CASSANDRA-4574

Add missing String.format call to log string contents patch by Julien Lambert reviewed by dbrosius for CASSANDRA-4574 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec76baf0 Tree:

[2/8] git commit: merge from 1.0

merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de039598 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de039598 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de039598

[6/8] git commit: fix toString of hint destination tokens patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568

fix toString of hint destination tokens patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4764a379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

git commit: fix merge

Updated Branches: refs/heads/trunk f5c19e84a - 70754af41 fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70754af4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70754af4 Diff:

[1/2] git commit: r/m unused SSTII.echoData

Updated Branches: refs/heads/trunk 70754af41 - 501d7134f r/m unused SSTII.echoData Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/501d7134 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/501d7134

[2/2] git commit: clarify that PCI.MergeTask operates on Rows, not NotifyingSSTableIdentityIterators

clarify that PCI.MergeTask operates on Rows, not NotifyingSSTableIdentityIterators Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0c2fa7a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0c2fa7a Diff:

[3/3] add request tracing patch by David Alves; reviewed by jbellis for CASSANDRA-1123

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c94432b/src/java/org/apache/cassandra/tracing/Tracing.java -- diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java

git commit: fix mispaste

Updated Branches: refs/heads/trunk 5c94432b2 - ad52ce4fa fix mispaste Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad52ce4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad52ce4f Diff:

git commit: fix NPE patch by David Alves for CASSANDRA-1123

Updated Branches: refs/heads/trunk ad52ce4fa - 5b6a2b11b fix NPE patch by David Alves for CASSANDRA-1123 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b6a2b11 Tree:

[2/2] redesign KEYS indexes to avoid read-before-write patch by Sam Tunnicliffe, jbellis, and Philip Jenvey for CASSANDRA-2897

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a1b93d7/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java -- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 de039598f - 60dadc5dc refs/heads/trunk 9cd53fba6 - f471b927b Merge branch 'cassandra-1.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/f471b927 Tree:

[2/3] git commit: heap defaults are pretty good now, change language to may wish to adjust

heap defaults are pretty good now, change language to may wish to adjust Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60dadc5d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60dadc5d Diff:

[3/3] git commit: heap defaults are pretty good now, change language to may wish to adjust

heap defaults are pretty good now, change language to may wish to adjust Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60dadc5d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60dadc5d Diff:

[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 60dadc5dc - b0342978a refs/heads/trunk f471b927b - aff58e8ee Merge branch 'cassandra-1.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/aff58e8e Tree:

[3/3] git commit: avoid recursion in leveled compaction patch by jbellis; reviewed by yukim for CASSANDRA-4587

avoid recursion in leveled compaction patch by jbellis; reviewed by yukim for CASSANDRA-4587 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0342978 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/3] git commit: avoid recursion in leveled compaction patch by jbellis; reviewed by yukim for CASSANDRA-4587

avoid recursion in leveled compaction patch by jbellis; reviewed by yukim for CASSANDRA-4587 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0342978 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

[2/2] git commit: optimize WriteResponse patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4548

optimize WriteResponse patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4548 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd2ddb5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd2ddb5c

[1/2] git commit: cleanup

Updated Branches: refs/heads/trunk bd2752721 - d7468ea14 cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7468ea1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7468ea1 Diff:

git commit: rename Entry - QueuedMessage

Updated Branches: refs/heads/trunk 7af7eb31e - 9c80f37d5 rename Entry - QueuedMessage Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c80f37d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c80f37d

git commit: finish renaming entry variables

Updated Branches: refs/heads/trunk 9c80f37d5 - ae6a58fd7 finish renaming entry variables Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae6a58fd Tree:

git commit: replace new Pair with Pair.create to take advantage of type inference

Updated Branches: refs/heads/trunk 94b3d2601 - 7af7eb31e replace new Pair with Pair.create to take advantage of type inference Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7af7eb31 Tree:

git commit: fix build including antlr

Updated Branches: refs/heads/trunk 84b25f0b0 - 94e4ace75 fix build including antlr Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94e4ace7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94e4ace7

[3/3] git commit: fix FD leak in slice queries patch by jbellis; reviewed by Sam Tunnicliffe and tested by brandonwilliams

fix FD leak in slice queries patch by jbellis; reviewed by Sam Tunnicliffe and tested by brandonwilliams Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1b10590 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[2/3] git commit: fix FD leak in slice queries patch by jbellis; reviewed by Sam Tunnicliffe and tested by brandonwilliams

fix FD leak in slice queries patch by jbellis; reviewed by Sam Tunnicliffe and tested by brandonwilliams Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1b10590 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

[1/3] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 5c91bd142 - e1b10590e refs/heads/trunk 769fe895a - 6c8687237 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c868723 Tree:

[2/6] git commit: merge from 1.0

merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f94c839d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f94c839d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f94c839d

[6/6] git commit: increase Xss to 160k to accomodate latest 1.6 JVMs patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4602

increase Xss to 160k to accomodate latest 1.6 JVMs patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4602 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08c65460 Tree: http://git-wip-us.apache.org/repos/asf

[3/6] git commit: merge from 1.0

merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f94c839d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f94c839d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f94c839d

[5/6] git commit: increase Xss to 160k to accomodate latest 1.6 JVMs patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4602

increase Xss to 160k to accomodate latest 1.6 JVMs patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4602 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08c65460 Tree: http://git-wip-us.apache.org/repos/asf

[1/6] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.0 4764a379e - 08c654601 refs/heads/cassandra-1.1 e1b10590e - f94c839dc refs/heads/trunk 6c8687237 - b2899f088 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

<    3   4   5   6   7   8   9   10   11   12   >