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

2013-06-26 Thread aleksey
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/6def8223 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6def8223 Diff:

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

2013-06-06 Thread dbrosius
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/6b16c1a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b16c1a5 Diff:

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

2013-05-04 Thread marcuse
Merge branch 'cassandra-1.2' into trunk Conflicts: build.xml src/java/org/apache/cassandra/db/compaction/LeveledManifest.java test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo

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

2013-05-01 Thread brandonwilliams
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/25438e6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25438e6e Diff:

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

2013-04-15 Thread dbrosius
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/a9d6aefd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9d6aefd Diff:

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

2013-03-19 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.2 6a7a28852 - 1fc218ff7 refs/heads/trunk f8fd16922 - bcabea730 Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2013-03-11 Thread jbellis
Updated Branches: refs/heads/cassandra-1.2 51d71a79b - 6caddcd91 refs/heads/trunk 57f3adef3 - 0f72806c3 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/0f72806c Tree:

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

2013-02-22 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.2 068b53dd5 - 3e8bffd00 refs/heads/trunk 755328b9c - c12ca89eb Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2013-02-01 Thread vijay
Updated Branches: refs/heads/trunk d52e12a86 - af0a5687e 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/af0a5687 Tree:

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

2013-01-18 Thread slebresne
Updated Branches: refs/heads/trunk 8cb7bc4af - 8646f9763 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/8646f976 Tree:

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

2013-01-16 Thread dbrosius
Updated Branches: refs/heads/trunk ead7312cf - 159293364 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/15929336 Tree:

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

2013-01-15 Thread slebresne
Updated Branches: refs/heads/trunk 64f8dfbd2 - cdeb9286f 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/cdeb9286 Tree:

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

2013-01-14 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.2 374524b5b - 3a81af190 refs/heads/trunk 1f337b6e5 - 3ff2a159d 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/3ff2a159 Tree:

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

2013-01-14 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.2 3a81af190 - 5e57ad3dc refs/heads/trunk 3ff2a159d - 61db12346 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/61db1234 Tree:

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

2013-01-11 Thread jbellis
Updated Branches: refs/heads/cassandra-1.2 6487bc50b - 374524b5b refs/heads/trunk 69540e025 - 1f337b6e5 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/1f337b6e Tree:

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

2013-01-09 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.2 b36a8081c - 9ccaaadec refs/heads/trunk 118cd0d99 - 049352f9b Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/HintedHandOffManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo

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

2013-01-04 Thread brandonwilliams
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:

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

2013-01-02 Thread aleksey
Updated Branches: refs/heads/trunk b7eaf009c - 210543588 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/21054358 Tree: