[1/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 91e63d054 - 7a0f496f2 refs/heads/trunk edb5f0883 - 70d8ad119 Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

[1/5] git commit: merge

Repository: cassandra Updated Branches: refs/heads/trunk 56141aee8 - d1e41c01e merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e682ffc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e682ffc4

[1/5] git commit: Merge commit '4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c' into cassandra-2.1.0

Repository: cassandra Updated Branches: refs/heads/trunk 740bcb540 - f7fab28ec Merge commit '4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b112db6

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

Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 da444a690 - 9405ce0e2 refs/heads/trunk 346d8fb6d - 9b1232929 Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Updated Branches: refs/heads/trunk ccbd1d528 - b5d07e582 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/b5d07e58 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 90ce4f78d - df580d426 Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df580d42 Tree:

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

Updated Branches: refs/heads/trunk be3a22906 - 43f7a776f 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/43f7a776 Tree:

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

Updated Branches: refs/heads/cassandra-1.2 2f7fbbaae - 6e21cad71 Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e21cad7 Tree:

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

Updated Branches: refs/heads/trunk c12d7cf44 - be89a954b Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/CounterColumn.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Updated Branches: refs/heads/trunk cedf6655c - f02ee5412 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/f02ee541 Tree:

[1/5] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.2.0 8dd1d56b4 - bd0b9 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd0b Diff:

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

Updated Branches: refs/heads/trunk 46689d88d - 85cd442e7 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/85cd442e 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:

[1/5] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 988ea81d4 - 93bd3d896 refs/heads/trunk 1078e6f51 - 5df3f13b6 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5df3f13b Tree:

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

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

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

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

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

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

Updated Branches: refs/heads/cassandra-1.1 67dec69f5 - be969899c refs/heads/trunk 602e383d6 - 45b057bcf 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/45b057bc Tree:

[1/5] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 efba67888 - 867478493 refs/heads/trunk 086c06ad7 - 76ada1106 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76ada110 Tree:

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

Updated Branches: refs/heads/cassandra-1.1 a4fab90af - f74ed12a7 refs/heads/trunk 8cd09 - 7398e9363 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/7398e936 Tree:

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

Updated Branches: refs/heads/cassandra-1.1 c37fe54f1 - 30e78d6dc refs/heads/trunk 6e8c23711 - 8104a70f0 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/8104a70f Tree:

[1/5] git commit: Merge branch '4247-3' into trunk

Updated Branches: refs/heads/trunk ac362dadd - 5f1d7b06b Merge branch '4247-3' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f1d7b06 Tree:

[1/5] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 38748b43d - d90f0f3e7 refs/heads/trunk 46b658f76 - 213974d84 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213974d8 Tree:

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

Updated Branches: refs/heads/cassandra-1.1 641346b0d - fd66ccf21 refs/heads/trunk 033486158 - 1bb2f32d8 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/1bb2f32d Tree:

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

Updated Branches: refs/heads/cassandra-1.1 8b81c8f2f - 641346b0d refs/heads/trunk 70554b2a3 - 4357676f3 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/4357676f Tree:

[1/5] git commit: Merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 0f9c391a1 - 44e7a0890 refs/heads/trunk 090fe813a - c5f2b57ad Merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5f2b57a Tree:

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

Updated Branches: refs/heads/trunk 4279ce466 - a0f5dc515 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:

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

Updated Branches: refs/heads/cassandra-1.1.0 54729ad2c - 762b45597 refs/heads/trunk 92606cadb - a14f08b5f 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/a14f08b5 Tree:

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

Updated Branches: refs/heads/cassandra-1.1 b69fd1aff - 7c50df3f6 Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c50df3f Tree:

[1/5] git commit: merge from 1.1.0

Updated Branches: refs/heads/cassandra-1.1 f73383667 - be89c8b18 merge from 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89c8b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89c8b1 Diff:

[1/5] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 b565fdbdc - 45af95ab3 refs/heads/trunk 9f0b09b00 - 1ba6dc1b0 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ba6dc1b Tree:

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

Updated Branches: refs/heads/cassandra-1.1 d685f45ee - 29376ff67 refs/heads/trunk 830495027 - abf0d991d 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/abf0d991 Tree:

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

Updated Branches: refs/heads/trunk 908e0e2d7 - ad4541e6b 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/ad4541e6 Tree:

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

Updated Branches: refs/heads/trunk 51a658d22 - 15ae2f630 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/migration/AddColumnFamily.java src/java/org/apache/cassandra/db/migration/AddKeyspace.java

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

Updated Branches: refs/heads/cassandra-1.1 555b73808 - 087644b6c refs/heads/trunk e36e68460 - 5ed172053 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/5ed17205 Tree:

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

Updated Branches: refs/heads/trunk caba4ee62 - 29804fa9a 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/29804fa9 Tree:

[1/5] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1.0

Updated Branches: refs/heads/cassandra-1.1.0 5f3175750 - d78db44cb Merge branch 'cassandra-1.0' into cassandra-1.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/DataTracker.java

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

Updated Branches: refs/heads/cassandra-1.1 1c56ec2da - 6e5722d7b Merge branch 'cassandra-1.1.0' into cassandra-1.1 Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

Updated Branches: refs/heads/cassandra-1.1 86d7c844c - f6ba989f9 refs/heads/trunk cc355ce6b - e0d9ade44 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/e0d9ade4 Tree:

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

Updated Branches: refs/heads/cassandra-1.1 78142cb79 - 94860c6c3 refs/heads/trunk edd97d4e1 - 15269be39 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/15269be3 Tree:

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

Updated Branches: refs/heads/cassandra-1.1 b0c0faeed - 33199c6ca refs/heads/trunk 875e05aa9 - edd97d4e1 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/edd97d4e Tree:

[1/5] git commit: merge from 1.0

Updated Branches: refs/heads/cassandra-1.1 9a842c7b3 - c5986871c merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5986871 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5986871 Diff:

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

Updated Branches: refs/heads/cassandra-1.1 3eefbac13 - 5f5e00bc9 refs/heads/trunk ced22f76b - 30ee8337e 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/30ee8337 Tree:

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

Updated Branches: refs/heads/cassandra-1.1 cbac7af79 - e36b2130f Merge branch 'cassandra-1.0' into cassandra-1.1 Conflicts: NEWS.txt src/java/org/apache/cassandra/config/DatabaseDescriptor.java src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java

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

Updated Branches: refs/heads/cassandra-1.0 68d4e28d9 - 2a1ec27e2 refs/heads/trunk a5b3abb66 - 73f7104cd Merge branch 'cassandra-1.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73f7104c Tree:

[1/5] git commit: merge from 1.0

Updated Branches: refs/heads/cassandra-1.0 89ed0b6ec - b10d5bd70 refs/heads/trunk 73f7104cd - aa20c7206 merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa20c720 Tree:

[1/5] git commit: merge from 1.0

Updated Branches: refs/heads/trunk 980663a39 - a4fc7e270 merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4fc7e27 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4fc7e27 Diff:

[1/5] git commit: merge from 1.0

Updated Branches: refs/heads/trunk 95ca3a21f - 710609baf merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/710609ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/710609ba Diff: