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

2012-11-07 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 d909fb4fa - f32110c6c refs/heads/trunk 0507dbe1c - 41175282d 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/41175282 Tree:

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

2012-10-09 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 19c3bd3b3 - f34bd79b9 refs/heads/trunk ed6d24e59 - 5e425cb15 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/5e425cb1 Tree:

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

2012-09-26 Thread brandonwilliams
Updated Branches: refs/heads/trunk c1724dd8a - 2edeeeba2 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/2edeeeba Tree:

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

2012-09-06 Thread slebresne
Updated Branches: refs/heads/trunk 0e3a9a55e - 42c55896b Merge branch 'cassandra-1.1' into trunk Conflicts: CHANGES.txt NEWS.txt build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2012-08-22 Thread jbellis
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:

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

2012-07-25 Thread brandonwilliams
Updated Branches: refs/heads/trunk e73b2a68b - d62f8c1e5 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/d62f8c1e Tree:

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

2012-06-29 Thread slebresne
Updated Branches: refs/heads/trunk b8578df60 - 3eff5455d Merge branch 'cassandra-1.1' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/Table.java

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

2012-06-27 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 54c647ffe - 8a3bb80e0 refs/heads/trunk 2bfea99dd - 33c7273cb 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/33c7273c Tree:

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

2012-06-25 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 7a510ac08 - eacdca02d refs/heads/trunk 2ce8274c6 - 708ab005a 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/708ab005 Tree:

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

2012-06-20 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 170e14ab9 - 65b09c8c9 refs/heads/trunk d59be21e8 - 97a1c789e 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/97a1c789 Tree:

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

2012-06-16 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 a21307a27 - 6dddf360e refs/heads/trunk 4d88a1dac - c34c70f0b 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/c34c70f0 Tree:

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

2012-06-12 Thread slebresne
Updated Branches: refs/heads/trunk 678f6ae38 - 682a34f36 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/682a34f3 Tree:

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

2012-05-31 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 d484e28d1 - a5e0994a1 refs/heads/trunk dc9e70eda - 90869e251 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/90869e25 Tree:

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

2012-05-30 Thread dbrosius
Updated Branches: refs/heads/trunk 52e09c100 - 25c7a7147 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/25c7a714 Tree:

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

2012-05-16 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 1e8685d83 - 7dae25d87 refs/heads/trunk 34bdc7cc9 - 71b38b094 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/71b38b09 Tree:

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

2012-05-14 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 f58a51bc5 - 68bae3131 refs/heads/trunk 347b5775e - 19ce000b2 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/19ce000b Tree:

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

2012-05-02 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 1686a36ed - 46e422a94 refs/heads/trunk 4b9a80231 - 06a7bf36b 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/06a7bf36 Tree:

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

2012-05-01 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 116d8a1a7 - 3a04d8548 refs/heads/trunk 8d0dd61b3 - b51a0d64f 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/b51a0d64 Tree:

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

2012-04-26 Thread slebresne
Updated Branches: refs/heads/trunk a05a5641f - a6c5d3c43 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/a6c5d3c4 Tree:

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

2012-04-12 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 33cdcaf73 - c215a4c96 refs/heads/trunk 531d01c04 - 8ab2473fe 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/8ab2473f Tree:

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

2012-04-09 Thread slebresne
Updated Branches: refs/heads/trunk 64305dd9f - b2cb52d8a 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/b2cb52d8 Tree:

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

2012-04-03 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 26c136d30 - 031e89417 refs/heads/trunk 4e8b92796 - f4595a791 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/f4595a79 Tree:

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

2012-03-29 Thread slebresne
Updated Branches: refs/heads/trunk 25b2a4275 - 27e322b63 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/27e322b6 Tree:

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

2012-03-27 Thread slebresne
Updated Branches: refs/heads/trunk ad37161c0 - 486368de9 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/486368de Tree:

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

2012-02-23 Thread slebresne
Updated Branches: refs/heads/trunk 7f3704172 - 950632012 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/95063201 Tree:

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

2012-02-22 Thread slebresne
Updated Branches: refs/heads/trunk a9e091910 - aa187053b 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/aa187053 Tree:

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

2012-02-22 Thread slebresne
Updated Branches: refs/heads/trunk aa187053b - a9769371b 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/a9769371 Tree:

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

2012-02-22 Thread slebresne
Updated Branches: refs/heads/trunk a9769371b - d359d8f61 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/d359d8f6 Tree:

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

2012-02-09 Thread jbellis
Updated Branches: refs/heads/cassandra-1.0 22b8a9725 - c3dc78941 refs/heads/trunk 819a74d8a - 6feb729c8 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/6feb729c Tree: