git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk 61f5e5005 -> f5dda349b 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/f5dda349 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

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/1a89ea49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a89ea49 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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/41ec9fc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41ec9fc4 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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

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

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

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

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

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

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/2] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk d6b7dd60f -> 49f297417 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/4] git commit: Merge branch 'cassandra-1.1' into trunk

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: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

Updated Branches: refs/heads/cassandra-1.1 6f384c54d -> f46232c0b refs/heads/trunk d62f8c1e5 -> b167e9ba7 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/b167e9ba Tree: htt

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

Updated Branches: refs/heads/trunk f650d3e82 -> 111f6c939 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/io/sstable/Descriptor.java src/java/org/apache/cassandra/io/sstable/SSTable

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

Updated Branches: refs/heads/trunk 111f6c939 -> 1507ce8cd Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/io/sstable/Descriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandr

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

Updated Branches: refs/heads/trunk 1507ce8cd -> 94e413f5a 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/94e413f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

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

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

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/6c521cae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c521cae Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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/2] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk d080f6f10 -> ca5318d37 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/ca5318d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

Updated Branches: refs/heads/trunk ca5318d37 -> acedc3438 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/acedc343 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

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/6] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 953bcb345 -> 988c4132d refs/heads/trunk 738bd9e15 -> a5e0331c7 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/dht/BootStrapper.java src/java/org/apache/cassandra/service/StorageService.java Project

[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: htt

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

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

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/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: htt

[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: htt

[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: htt

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

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/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: http://git-wip-us.apache

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

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/4] git commit: Merge branch 'cassandra-1.1' into trunk

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: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4

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

Updated Branches: refs/heads/trunk 42c55896b -> d5fc1932e Merge branch 'cassandra-1.1' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java src/java/org/apache/cassandra/service/StorageProxy.java src/java/org/apache/

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

Updated Branches: refs/heads/trunk 208d77b7a -> 55df844e0 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/55df844e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

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/ae96aace Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae96aace Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Updated Branches: refs/heads/cassandra-1.1 1e6cc9aeb -> 5a63858d0 refs/heads/trunk 5bb13b426 -> a946e61d1 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/a946e61d Tree: htt

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

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/69a243a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69a243a5 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Updated Branches: refs/heads/cassandra-1.1 6a8ba0731 -> aa7dafaca refs/heads/trunk 20d53c095 -> 85fc72be8 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/85fc72be Tree: htt

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

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

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

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

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

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

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/edd0d6d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edd0d6d8 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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

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

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/5] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 db45670a3 -> 789aab11e refs/heads/trunk 8fbbdf07a -> cc2ced82b 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/cc2ced82 Tree: htt

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

Updated Branches: refs/heads/cassandra-1.0 19800189d -> 4f51c70e1 refs/heads/cassandra-1.1 789aab11e -> 6fc4b3a64 refs/heads/trunk cc2ced82b -> 095249615 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

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

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/4] git commit: Merge branch 'cassandra-1.1' into trunk

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: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

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

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/2] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk ab13579a3 -> f3e24bd51 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/SelectStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/as

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

Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/cql3/QueryProcessor.java src/java/org/apache/cassandra/cql3/statements/SelectStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/a

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

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/2] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk db36acbf1 -> 038aa6bca Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/SelectStatement.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

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/2] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk e3f642b8c -> 1b56ad122 Merge branch 'cassandra-1.1' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/CFPropDefs.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repo

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

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

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

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/5] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 2773f7cd8 -> 9d7fba989 refs/heads/trunk 0bdd152fb -> a812998e2 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/a812998e Tree: htt

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

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/21b7bbe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21b7bbe6 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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: htt

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

Updated Branches: refs/heads/trunk 5e425cb15 -> 78783556b 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/78783556 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

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/6] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.1 a0900f3d3 -> 4d2e5e73b refs/heads/trunk fe5e4aef2 -> 7e937b3d1 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/7e937b3d Tree: htt

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

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

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

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

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/2bcbec02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bcbec02 Diff: http://git-wip-us.apache.org/repos/asf/cassand

[1/2] git commit: merge branch cassandra-1.1 into trunk

Updated Branches: refs/heads/trunk e63a1ae1c -> ebd11d3ad merge branch cassandra-1.1 into trunk Conflicts: src/java/org/apache/cassandra/service/ClientState.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/co

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

Updated Branches: refs/heads/cassandra-1.1 f22e2c459 -> 95fb613bf refs/heads/trunk a58b87020 -> dd8a3c450 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java src/java/org/apache/cassandra/thrift/CassandraServer.java P

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

Updated Branches: refs/heads/trunk 95f94a4da -> c86a7f8ca Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/a

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

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/98effbf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98effbf6 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

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

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

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

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/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/cassandra-1.0 373e5b0d5 -> 73f479c28 refs/heads/cassandra-1.1 d401d9f1d -> 239d66f14 refs/heads/trunk 5225ed944 -> bdc9a158e Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

Updated Branches: refs/heads/trunk 998131635 -> 84e1ed4c6 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/84e1ed4c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

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

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

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

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/2] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk 5467fb52f -> 2821490b1 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache

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

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: htt

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

Updated Branches: refs/heads/cassandra-1.1 4a4e707ae -> b565fdbdc refs/heads/cassandra-1.1.0 d3c5dbdd6 -> c38d32638 refs/heads/trunk 1c9637f45 -> 9f0b09b00 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

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/4] git commit: Merge branch 'cassandra-1.1' into trunk

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: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

Updated Branches: refs/heads/cassandra-1.1 dcf89bfae -> 1c6b75698 refs/heads/cassandra-1.1.0 75fdb8525 -> 81e609d3f refs/heads/trunk 486368de9 -> d97a671f5 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

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

Updated Branches: refs/heads/cassandra-1.0 9fc1d5c23 -> 270d0165d refs/heads/cassandra-1.1 1c6b75698 -> 8ac731efa refs/heads/cassandra-1.1.0 81e609d3f -> e3c4c095f refs/heads/trunk d97a671f5 -> b651778c4 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos

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

Updated Branches: refs/heads/cassandra-1.1 8ac731efa -> 42a0a46a8 refs/heads/trunk b651778c4 -> e30febf25 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/e30febf2 Tree: htt

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

Updated Branches: refs/heads/cassandra-1.0 270d0165d -> 281af5e4f refs/heads/cassandra-1.1 14e44db00 -> 5086eef20 refs/heads/cassandra-1.1.0 baf130094 -> 2b44e5460 refs/heads/trunk e09dd2aa6 -> e194915a8 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos

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

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: http://git-wip-us.apache.org/repos/asf/cassandra/tree

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

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/8] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches: refs/heads/trunk 3f7c7323b -> 38515b19a Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java src/java/or

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

Updated Branches: refs/heads/cassandra-1.0 5cde93d96 -> 4a6531172 refs/heads/cassandra-1.1 79354482a -> a40e162ba refs/heads/cassandra-1.1.0 e5a324e31 -> 41314a21d refs/heads/trunk 38515b19a -> 6c5b1b663 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos

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

Updated Branches: refs/heads/cassandra-1.1 a40e162ba -> cd20c3a63 refs/heads/cassandra-1.1.0 41314a21d -> e4e87661d refs/heads/trunk 03c3fec4c -> 760e992ed Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apac

  1   2   3   4   >