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

2012-11-06 Thread slebresne
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:

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

2012-11-02 Thread brandonwilliams
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:

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

2012-10-24 Thread slebresne
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:

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

2012-10-18 Thread eevans
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:

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

2012-10-09 Thread dbrosius
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:

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

2012-10-05 Thread slebresne
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:

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

2012-10-04 Thread slebresne
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:

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

2012-10-02 Thread slebresne
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:

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

2012-09-11 Thread slebresne
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:

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

2012-09-07 Thread slebresne
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

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

2012-07-27 Thread brandonwilliams
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:

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

2012-07-27 Thread brandonwilliams
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:

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

2012-07-26 Thread slebresne
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

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

2012-07-26 Thread slebresne
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:

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

2012-07-26 Thread brandonwilliams
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:

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

2012-07-23 Thread slebresne
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:

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

2012-06-29 Thread slebresne
Updated Branches: refs/heads/trunk 3eff5455d - 6d5d91eec 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/6d5d91ee Tree:

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

2012-06-12 Thread vijay
Updated Branches: refs/heads/trunk 682a34f36 - 749522b7f 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/749522b7 Tree:

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

2012-06-08 Thread dbrosius
Updated Branches: refs/heads/trunk 72a74c3cb - 63b6c029f 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/63b6c029 Tree:

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

2012-06-01 Thread slebresne
Updated Branches: refs/heads/trunk 90869e251 - 770c20127 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/service/MigrationManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2012-05-30 Thread slebresne
Updated Branches: refs/heads/trunk 8a2afef95 - dc920ab63 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/dc920ab6 Tree:

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

2012-05-29 Thread slebresne
Updated Branches: refs/heads/trunk b4d94c0e7 - 9118804b5 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/9118804b Tree:

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

2012-05-26 Thread dbrosius
Updated Branches: refs/heads/trunk 48b6df95b - 9aa8c0f47 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/9aa8c0f4 Tree:

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

2012-05-23 Thread jbellis
Updated Branches: refs/heads/trunk cc112ae30 - bc783baab 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/bc783baa Tree:

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

2012-05-22 Thread slebresne
Updated Branches: refs/heads/trunk 2ed977a3c - 09ff86140 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/09ff8614 Tree:

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

2012-05-03 Thread slebresne
Updated Branches: refs/heads/trunk a0f5dc515 - fb2bfc984 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/fb2bfc98 Tree:

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

2012-04-09 Thread slebresne
Updated Branches: refs/heads/trunk b2cb52d8a - 372708461 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/37270846 Tree:

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

2012-03-22 Thread slebresne
Updated Branches: refs/heads/trunk fe507e305 - e571ec2c6 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/e571ec2c Tree:

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

2012-03-16 Thread slebresne
Updated Branches: refs/heads/trunk 23b1c5249 - c5649e072 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/c5649e07 Tree:

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

2012-02-29 Thread scode
Updated Branches: refs/heads/trunk 927356e0c - 27fb2bffb 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/27fb2bff Tree:

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

2012-02-22 Thread goffinet
Updated Branches: refs/heads/trunk 130b8656b - 590661faf 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/590661fa Tree:

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

2012-02-14 Thread slebresne
Updated Branches: refs/heads/trunk d19182a50 - c738e564f 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/c738e564 Tree:

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

2012-02-14 Thread slebresne
Updated Branches: refs/heads/trunk c738e564f - 2170f1e80 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/2170f1e8 Tree:

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

2012-02-14 Thread brandonwilliams
Updated Branches: refs/heads/trunk 2170f1e80 - 887c7f9c2 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/887c7f9c Tree:

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

2012-02-14 Thread goffinet
Updated Branches: refs/heads/trunk 887c7f9c2 - 418d27a1e 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/418d27a1 Tree:

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

2012-02-14 Thread goffinet
Updated Branches: refs/heads/trunk 418d27a1e - e533b9fd8 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/e533b9fd Tree:

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

2012-02-14 Thread scode
Updated Branches: refs/heads/trunk 182a36bc4 - 6642d0f95 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/6642d0f9 Tree:

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

2012-02-13 Thread slebresne
Updated Branches: refs/heads/trunk 30ee8337e - ddc771dc5 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/ddc771dc Tree:

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

2012-02-07 Thread slebresne
Updated Branches: refs/heads/trunk 9f668caed - 45e4484cc 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/45e4484c Tree:

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

2012-02-06 Thread goffinet
Updated Branches: refs/heads/trunk 8fa285c8b - 9f668caed 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/9f668cae Tree:

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

2012-02-05 Thread jbellis
Updated Branches: refs/heads/trunk 0ba454168 - 76736edc6 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/76736edc Tree:

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

2012-02-02 Thread brandonwilliams
Updated Branches: refs/heads/trunk 332e5a511 - e12d4430e 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/e12d4430 Tree:

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

2012-02-01 Thread brandonwilliams
Updated Branches: refs/heads/trunk e36926b8b - 6592bc9a9 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/6592bc9a Tree:

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

2012-01-31 Thread slebresne
Updated Branches: refs/heads/trunk 3e0f09028 - e36926b8b 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/e36926b8 Tree: