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

2012-11-02 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 c7399e97e -> 988c10fd3 refs/heads/trunk a3e31e50b -> ae77ecbaa 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/ae77ecba Tree: htt

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

2012-11-02 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 2644aa965 -> c7399e97e refs/heads/trunk deb6feb7f -> 38a377336 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/net/MessagingService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

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

2012-11-02 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 a412ebd5b -> 2644aa965 refs/heads/trunk e0c2ea427 -> deb6feb7f Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/net/MessagingService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit

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

2012-11-02 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 110f69c3b -> a412ebd5b refs/heads/trunk f0114cfe7 -> e0c2ea427 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/e0c2ea42 Tree: htt

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

2012-10-31 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 99b245d31 -> d401d9f1d refs/heads/trunk c320b82be -> c631cc7c3 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/streaming/IncomingStreamReader.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/r

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

2012-10-26 Thread brandonwilliams
Updated Branches: refs/heads/trunk 64f3ab270 -> 213d25c99 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/213d25c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-10-25 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 77573c599 -> 0712c66f5 refs/heads/trunk 14afcc7d7 -> 21c57a094 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/21c57a09 Tree: htt

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

2012-10-25 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 e4fc1ebba -> 77573c599 refs/heads/trunk c54fe4c41 -> e93eacec7 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/e93eacec Tree: htt

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

2012-10-16 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 e1491f3f2 -> b8874ad1a refs/heads/trunk 8c471240d -> 61f5e5005 Merge branch 'cassandra-1.1' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java test/unit/org/apache/c

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

2012-10-16 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 4d2e5e73b -> e1491f3f2 refs/heads/trunk 18acbef13 -> 771005e99 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/771005e9 Tree: htt

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

2012-10-11 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 178c934aa -> 4355aa877 refs/heads/trunk 63a5e4ef8 -> 286a175d8 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/286a175d Tree: htt

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

2012-10-09 Thread jbellis
Updated Branches: refs/heads/trunk 52ecf41d2 -> 0bdd152fb 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/0bdd152f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-10-08 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 6d13ce69b -> 0d1249372 refs/heads/trunk 04859be40 -> fc3235841 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/fc323584 Tree: htt

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

2012-10-08 Thread jbellis
Updated Branches: refs/heads/trunk ee5aafe6a -> 9a0d9e586 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/9a0d9e58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-10-04 Thread brandonwilliams
Updated Branches: refs/heads/trunk 038aa6bca -> 780ccc8ba 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/780ccc8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-10-03 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 0e0213b60 -> d170a7a99 refs/heads/trunk 7833db260 -> dbcf00df8 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/config/Config.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http:

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

2012-09-28 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 c710edf07 -> 732d82b4d refs/heads/trunk ccd1a3d38 -> 7a9ca840a Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/tools/BulkLoader.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: ht

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

2012-09-27 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 93bd3d896 -> c7ce11f00 refs/heads/trunk 0b94b191d -> 29353b8aa 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/29353b8a Tree: htt

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

2012-09-25 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 b961986a7 -> 05a5ede91 refs/heads/trunk 5c1612017 -> 7dee84c34 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/7dee84c3 Tree: htt

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

2012-09-24 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 0307dca20 -> b961986a7 refs/heads/trunk 356e8ab5e -> f177d8e59 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/f177d8e5 Tree: htt

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

2012-09-24 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 686fe1e14 -> db45670a3 refs/heads/trunk fa9bbf7e1 -> 8fbbdf07a 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/8fbbdf07 Tree: htt

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

2012-09-21 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 ef8620f88 -> 686fe1e14 refs/heads/trunk ae6a43c22 -> d634f0516 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/d634f051 Tree: htt

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

2012-09-21 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 117d91ae2 -> ef8620f88 refs/heads/trunk dc97a8ff5 -> ae6a43c22 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/ae6a43c2 Tree: htt

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

2012-09-18 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 e7f28f303 -> e6326e9fd refs/heads/trunk 0ea28c858 -> dd79571f5 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/dd79571f Tree: htt

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

2012-09-17 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 4d600f338 -> e7f28f303 refs/heads/trunk 1f3990f12 -> 12691ae3a 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/12691ae3 Tree: htt

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

2012-09-17 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 6ad7d45ad -> 4d600f338 refs/heads/trunk 0666e1952 -> 1f3990f12 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/1f3990f1 Tree: htt

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

2012-09-17 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 aa7dafaca -> 6ad7d45ad refs/heads/trunk 85fc72be8 -> 0666e1952 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/0666e195 Tree: htt

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

2012-09-05 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 846b14019 -> 8eb2fed1e refs/heads/trunk bf2d3433b -> 00e715054 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java src/java/org/apache/cassandra/service/Abst

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

2012-08-30 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 b0342978a -> 6e1f3a019 refs/heads/trunk aff58e8ee -> 39fdebfd4 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/Directories.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http

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

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

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

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

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

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

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

2012-08-20 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 f5619bbfd -> 7db46ef80 refs/heads/trunk 9d2b26dac -> 18b49021b Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/

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

2012-07-28 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 0819ad144 -> 2d71a8eea refs/heads/trunk 7d857e68a -> 3a8bd3657 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/3a8bd365 Tree: htt

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

2012-07-27 Thread brandonwilliams
Updated Branches: refs/heads/trunk 203d0d109 -> d080f6f10 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/d080f6f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-07-27 Thread slebresne
Updated Branches: refs/heads/trunk dc071e702 -> 9af3b023e Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/as

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

2012-07-23 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 ff64c5d11 -> 29379a525 refs/heads/trunk 655a76fac -> d6b7dd60f 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/d6b7dd60 Tree: htt

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

2012-07-14 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 7f6cc5ef6 -> 9f32efa72 refs/heads/trunk 1cb0ad5c4 -> 3c92afdd8 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/3c92afdd Tree: htt

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

2012-07-13 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 962b23ba0 -> 7f6cc5ef6 refs/heads/trunk e117cbe2b -> 2f4c7c4dc 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/2f4c7c4d Tree: htt

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

2012-07-12 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 1e7604462 -> 962b23ba0 refs/heads/trunk d569f873d -> e117cbe2b 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/e117cbe2 Tree: htt

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

2012-07-12 Thread slebresne
Updated Branches: refs/heads/trunk 93afc3555 -> bd9ab5923 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/bd9ab592 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-07-11 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 a12aa0815 -> 3e4858271 refs/heads/trunk 6ab4bd7a1 -> ee5c09a85 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/ee5c09a8 Tree: htt

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

2012-07-11 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 346ac03c2 -> a12aa0815 refs/heads/trunk 8e503d8d9 -> 6ab4bd7a1 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/6ab4bd7a Tree: htt

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

2012-06-28 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 bc2dea8b6 -> 67c26d471 refs/heads/trunk a4add9573 -> 1f8b2e9d7 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/1f8b2e9d Tree: htt

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

2012-06-26 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 80d7d43e2 -> 98dc41393 refs/heads/trunk 9c5630112 -> 681e2dea7 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/681e2dea Tree: htt

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

2012-06-26 Thread slebresne
Updated Branches: refs/heads/trunk 0240cc9df -> 9c5630112 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/9c563011 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-06-25 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 eacdca02d -> ae76bda56 refs/heads/trunk 27a816e5f -> 4dc18a215 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/4dc18a21 Tree: htt

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

2012-06-21 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 65b09c8c9 -> 8128119a0 refs/heads/trunk 67e4fdb43 -> 1ecd9b7e9 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/1ecd9b7e Tree: htt

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

2012-06-18 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 0ba2631ee -> 45c8f53a2 refs/heads/trunk a67a03996 -> a89c8b4d3 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/a89c8b4d Tree: htt

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

2012-06-18 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 0cc168a96 -> 0ba2631ee refs/heads/trunk d0d21aded -> 054358bf4 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/054358bf Tree: htt

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

2012-06-18 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 6dddf360e -> 0cc168a96 refs/heads/trunk 72a2e528c -> d0d21aded 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/d0d21ade Tree: htt

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

2012-06-14 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 33f1bacbf -> a4fab90af refs/heads/trunk aa267059c -> 15577ba86 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/15577ba8 Tree: htt

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

2012-05-30 Thread yukim
Updated Branches: refs/heads/cassandra-1.1 3fdc86ca0 -> 5cda764a9 refs/heads/trunk cfe585c2c -> 52e09c100 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/io/sstable/SSTableReader.java

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

2012-05-29 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 5177d56f3 -> 5796542aa refs/heads/trunk 9118804b5 -> 8a2afef95 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/8a2afef9 Tree: htt

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

2012-05-26 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 db68e03f7 -> 2dc27a175 refs/heads/trunk 802bee2bf -> 48b6df95b 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/48b6df95 Tree: htt

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

2012-05-26 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 dad8d80fe -> db68e03f7 refs/heads/trunk 15d690fdc -> 802bee2bf 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/802bee2b Tree: htt

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

2012-05-25 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 cbf043618 -> cf9a581bf refs/heads/trunk 5ab69b62c -> 782b1561f 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/782b1561 Tree: htt

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

2012-05-24 Thread slebresne
Updated Branches: refs/heads/trunk 969a310c5 -> 2979820e5 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/2979820e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-05-23 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 30e78d6dc -> a4f06c237 refs/heads/trunk 8104a70f0 -> 969a310c5 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/969a310c Tree: htt

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

2012-05-21 Thread dbrosius
Updated Branches: refs/heads/trunk 0848844e2 -> 2ed977a3c 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/2ed977a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-05-21 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 02672936f -> eef779635 refs/heads/trunk 5f1d7b06b -> 0848844e2 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/0848844e Tree: htt

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

2012-05-21 Thread vijay
Updated Branches: refs/heads/trunk 3fd08ddfb -> ac362dadd 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/ac362dad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-05-18 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 d90f0f3e7 -> 2c01cba39 refs/heads/trunk 213974d84 -> 78caed6b7 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/78caed6b Tree: htt

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

2012-05-15 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 783e5d4c5 -> 5979bce8e refs/heads/trunk 4c63c8656 -> 9263835ba 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/9263835b Tree: htt

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

2012-05-11 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 374fa2c2f -> 47783861a refs/heads/trunk c3e6a1c31 -> 347b5775e 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/347b5775 Tree: htt

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

2012-05-04 Thread slebresne
Updated Branches: refs/heads/trunk 359c38a8f -> 090fe813a 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/090fe813 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-05-02 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 46e422a94 -> 606e666f8 refs/heads/trunk 06a7bf36b -> 1d86bd40a 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/1d86bd40 Tree: htt

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

2012-04-25 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 58dceaa6a -> cc68c49f4 refs/heads/trunk ea117154f -> a05a5641f 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/a05a5641 Tree: htt

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

2012-04-24 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 150b3167f -> 808d7c9f3 refs/heads/trunk d94314a14 -> de59418d6 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/de59418d Tree: htt

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

2012-04-18 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 57de08a9d -> 01a8c1c5f refs/heads/trunk db4811e13 -> 28a1f7a71 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/28a1f7a7 Tree: htt

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

2012-04-16 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 ac21a555c -> a6302d6d7 refs/heads/trunk c9759116f -> 3654a8c44 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/3654a8c4 Tree: htt

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

2012-04-16 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 67b340bec -> 3f8372c1f refs/heads/trunk 78b074bc4 -> 95c105ba2 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/95c105ba Tree: htt

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

2012-04-16 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 f57f1c07c -> 67b340bec refs/heads/trunk 2914f15a0 -> 78b074bc4 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/78b074bc Tree: htt

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

2012-04-10 Thread brandonwilliams
Updated Branches: refs/heads/trunk 3f0dae762 -> aa83c7f2f 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/aa83c7f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-04-04 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 0a8e978e7 -> 63f6c8431 refs/heads/trunk b8231eb22 -> d616dcdd7 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/d616dcdd Tree: htt

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

2012-03-29 Thread brandonwilliams
Updated Branches: refs/heads/cassandra-1.1 27c999a11 -> 190e27bb5 refs/heads/trunk 27e322b63 -> f0ea699e6 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/f0ea699e Tree: htt

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

2012-03-26 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 45af95ab3 -> b4af12b43 refs/heads/trunk 1ba6dc1b0 -> 1d850e1a5 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/1d850e1a Tree: htt

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

2012-03-19 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 fe980034e -> 0e2706a7f refs/heads/trunk 02a302a93 -> 1a362131a 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/1a362131 Tree: htt

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

2012-03-13 Thread slebresne
Updated Branches: refs/heads/trunk 4e17ac469 -> de594860f 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/de594860 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-03-06 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 38e145bd2 -> 4fe3bb13e refs/heads/trunk 170146f64 -> caba4ee62 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/caba4ee6 Tree: htt

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

2012-03-06 Thread scode
Updated Branches: refs/heads/trunk 725251c3b -> 170146f64 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/170146f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-03-05 Thread scode
Updated Branches: refs/heads/trunk 4f5ea3452 -> 725251c3b 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/725251c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-03-05 Thread scode
Updated Branches: refs/heads/trunk 4a60654d1 -> 4f5ea3452 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/4f5ea345 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-29 Thread scode
Updated Branches: refs/heads/trunk ac0de1ee2 -> 927356e0c 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/927356e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-28 Thread scode
Updated Branches: refs/heads/trunk 061595faf -> ac0de1ee2 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/ac0de1ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-28 Thread slebresne
Updated Branches: refs/heads/trunk 1c507e5f9 -> d82814ae4 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/d82814ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-21 Thread brandonwilliams
Updated Branches: refs/heads/trunk 59a36304c -> 130b8656b 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/130b8656 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-16 Thread brandonwilliams
Updated Branches: refs/heads/trunk 15269be39 -> 62491eaa2 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/62491eaa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-14 Thread brandonwilliams
Updated Branches: refs/heads/trunk e28e7e967 -> 182a36bc4 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/182a36bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-14 Thread slebresne
Updated Branches: refs/heads/trunk 26e80d742 -> d19182a50 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/d19182a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-13 Thread brandonwilliams
Updated Branches: refs/heads/trunk 4d55a36aa -> 26e80d742 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/26e80d74 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-13 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 6a6bf3cf1 -> 9a842c7b3 refs/heads/trunk ddc771dc5 -> 232da8248 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/232da824 Tree: htt

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

2012-02-09 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 e5be9520b -> 12d26f869 refs/heads/trunk 7bc09f927 -> 59673232d 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/59673232 Tree: htt

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

2012-02-09 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 0183dc0b3 -> e5be9520b refs/heads/trunk 6feb729c8 -> 7bc09f927 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/7bc09f92 Tree: htt

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

2012-02-08 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 ba637b4d1 -> 96afdba85 refs/heads/trunk 256e7c261 -> d6362da57 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/d6362da5 Tree: htt

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

2012-02-08 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 1176d9f3a -> ba637b4d1 refs/heads/trunk 9b98a -> 256e7c261 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/256e7c26 Tree: htt

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

2012-02-07 Thread jbellis
Updated Branches: refs/heads/cassandra-1.1 9a336a192 -> a277fbedb refs/heads/trunk e9b692586 -> f297f54ed 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/f297f54e Tree: htt

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

2012-02-06 Thread slebresne
Updated Branches: refs/heads/trunk 5080f7a25 -> 07f39e8ec 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/07f39e8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

2012-02-06 Thread slebresne
Updated Branches: refs/heads/trunk 92813d9f0 -> 5080f7a25 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/5080f7a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree