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

2013-05-26 Thread slebresne
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/314c8e85 Tree: http://git-wip-us.apache.org/rep

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

2013-05-21 Thread brandonwilliams
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44f178d1 Tree: http://git-wip-us.apache.org/rep

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

2013-04-19 Thread jbellis
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/d11ba8ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d11ba8ab Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-04-19 Thread jasobrown
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: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-03-22 Thread jbellis
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/4ee8369b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ee8369b Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-03-22 Thread jbellis
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/411ad9df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/411ad9df Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-02-26 Thread jbellis
Updated Branches: refs/heads/cassandra-1.2 88b9d9516 -> a4166496f refs/heads/trunk 7d5490b58 -> c5f9ac87f 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/c5f9ac87 Tree: htt

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

2013-02-23 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 00748405b -> 3b98e63dd refs/heads/cassandra-1.2 d055df734 -> 9d0571acf refs/heads/trunk f3e0aa683 -> 788f873f5 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-02-11 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 310bf3485 -> 577cb2c76 refs/heads/cassandra-1.2 0820b20fb -> 6d3ef440d refs/heads/trunk 4e9d01f50 -> 50b8bf2c1 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-02-01 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 ddab67d37 -> 6bddbb2dd refs/heads/cassandra-1.2 fa1f9bab7 -> 15214fee1 refs/heads/trunk af0a5687e -> 169e0b186 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-22 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 a7da0295d -> 3b3686460 refs/heads/cassandra-1.2 3d9d51780 -> 1559b4971 refs/heads/trunk 59e3f3b9e -> 3b21f6917 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-18 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 be0119778 -> a7da0295d refs/heads/cassandra-1.2 17adf8e4f -> a330716d4 refs/heads/trunk 262fadb27 -> 0d5738f1f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-18 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 f930eb79c -> be0119778 refs/heads/cassandra-1.2 a71e526e3 -> 43123d1cc refs/heads/trunk eaedd259c -> 47de14731 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-18 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 1311649b4 -> f930eb79c refs/heads/cassandra-1.2 e6b6eaa58 -> 4df8fdcde refs/heads/trunk 8b39a1615 -> 2226e0c94 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-15 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.2 a548f05de -> fac299f8a refs/heads/trunk 83c014777 -> c83110609 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/c8311060 Tree: htt

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

2013-01-14 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 7de6f9666 -> 4ff5b0ff2 refs/heads/cassandra-1.2 5e57ad3dc -> 9c320d751 refs/heads/trunk 61db12346 -> 7196abc39 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-11 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 1cbbba095 -> 3cc8656f8 refs/heads/cassandra-1.2 18a1a4b93 -> 8d9510ae4 refs/heads/trunk 1eea9227d -> 8201299dc Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-11 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 3bb84e9e2 -> 1cbbba095 refs/heads/cassandra-1.2 189131631 -> 18a1a4b93 refs/heads/trunk 549996eab -> 1eea9227d Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-10 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 f481a3916 -> ccdb632d4 refs/heads/cassandra-1.2 1b41d6fea -> a1b601e43 refs/heads/trunk eebf3fb15 -> 02b515766 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-10 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 0d2410e78 -> f481a3916 refs/heads/cassandra-1.2 94f0b8568 -> 1b41d6fea refs/heads/trunk 958ba2ba0 -> eebf3fb15 Merge branch 'cassandra-1.2' into trunk Conflicts: test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java Project:

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

2013-01-09 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 0906b7cc5 -> 0d2410e78 refs/heads/cassandra-1.2 1c2a69c35 -> 94f0b8568 refs/heads/trunk c7366c508 -> 958ba2ba0 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-04 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 3034eeecb -> bf1ed4089 refs/heads/cassandra-1.2 9852a9360 -> af8a477cc refs/heads/trunk d495727d9 -> f6df04dbd Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

2013-01-04 Thread brandonwilliams
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: http://git-wip-us.apache