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

2014-03-09 Thread vijay
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5968f7b2 Tree: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-19 Thread slebresne
Merge branch 'cassandra-2.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/89b8b1a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89b8b1a7 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-17 Thread slebresne
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/cql3/CFDefinition.java src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java src/java/org/apache/cassandra/cql3/Cql.g src/java/org/apache/cassandra/cql3/statements/SelectStatement.j

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

2014-02-14 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fddc09b Tree: http://git-wip-us.apache.org/

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

2014-02-14 Thread slebresne
Merge branch 'cassandra-2.0' 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/asf/cassandra/commit/c36656c0 Tree: http://git-wip-us.apache.org

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

2014-02-13 Thread aleksey
Merge branch 'cassandra-2.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/21de3328 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21de3328 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-12 Thread jbellis
Merge branch 'cassandra-2.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/15d60756 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15d60756 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-12 Thread jbellis
Merge branch 'cassandra-2.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/d4461f83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4461f83 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-12 Thread jbellis
Merge branch 'cassandra-2.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/f78db530 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f78db530 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-12 Thread jbellis
Merge branch 'cassandra-2.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/1ede2967 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ede2967 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-12 Thread aleksey
Merge branch 'cassandra-2.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/f5b3515e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5b3515e Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-11 Thread brandonwilliams
Merge branch 'cassandra-2.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/e58737fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e58737fe Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-10 Thread marcuse
Merge branch 'cassandra-2.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/503a8a86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/503a8a86 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-09 Thread jbellis
Merge branch 'cassandra-2.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/de9be79d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de9be79d Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-07 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813da911 Tree: http://git-wip-us.apache.org/repos/asf/cassandra

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

2014-02-07 Thread brandonwilliams
Merge branch 'cassandra-2.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/f71ef609 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f71ef609 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-06 Thread brandonwilliams
Merge branch 'cassandra-2.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/ff2a92c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff2a92c1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-06 Thread brandonwilliams
Merge branch 'cassandra-2.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/ac666706 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac666706 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-06 Thread jbellis
Merge branch 'cassandra-2.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/3a82adb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a82adb8 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-06 Thread jbellis
Merge branch 'cassandra-2.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/5653516e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5653516e Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-05 Thread slebresne
Merge branch 'cassandra-2.0' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/AtomicSortedColumns.java src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repo

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

2014-02-04 Thread dbrosius
Merge branch 'cassandra-2.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/45c70154 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45c70154 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-04 Thread brandonwilliams
Merge branch 'cassandra-2.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/c947c126 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c947c126 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-02-03 Thread aleksey
Merge branch 'cassandra-2.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/78f71420 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78f71420 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-30 Thread jasobrown
Merge branch 'cassandra-2.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/00fc3186 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00fc3186 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-29 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/DataRange.java src/java/org/apache/cassandra/db/index/SecondaryIndex.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/re

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

2014-01-28 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/341d6c48 Tree: http://git-wip-us.apache.org/rep

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

2014-01-28 Thread aleksey
Merge branch 'cassandra-2.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/91893660 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91893660 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-28 Thread yukim
Merge branch 'cassandra-2.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/9c9552ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c9552ae Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-27 Thread jbellis
Merge branch 'cassandra-2.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/82735e09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82735e09 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-27 Thread slebresne
Merge branch 'cassandra-2.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/680f2bda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/680f2bda Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-24 Thread brandonwilliams
Merge branch 'cassandra-2.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/4724d562 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4724d562 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-23 Thread jbellis
Merge branch 'cassandra-2.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/630d5ee8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/630d5ee8 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-22 Thread brandonwilliams
Merge branch 'cassandra-2.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/b9260092 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9260092 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-19 Thread aleksey
Merge branch 'cassandra-2.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/6aaa0231 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6aaa0231 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-17 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/BatchlogManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c112047 Tree: http://git-wip-us.apache.org/repos/asf/ca

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

2014-01-16 Thread brandonwilliams
Merge branch 'cassandra-2.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/8a078054 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a078054 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-16 Thread jbellis
Merge branch 'cassandra-2.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/3d5eea5b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d5eea5b Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-16 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/CounterCell.java src/java/org/apache/cassandra/db/CounterUpdateCell.java src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java src/java/org/apache/cassandra/db/compact

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

2014-01-14 Thread brandonwilliams
Merge branch 'cassandra-2.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/31228677 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31228677 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-14 Thread brandonwilliams
Merge branch 'cassandra-2.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/54f728c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54f728c7 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-14 Thread brandonwilliams
Merge branch 'cassandra-2.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/eb354fb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb354fb4 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-14 Thread jbellis
Merge branch 'cassandra-2.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/4910ce80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4910ce80 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-13 Thread brandonwilliams
Merge branch 'cassandra-2.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/f07aa399 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f07aa399 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-13 Thread brandonwilliams
Merge branch 'cassandra-2.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/e3d1e38a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3d1e38a Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-13 Thread slebresne
Merge branch 'cassandra-2.0' 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/asf/cassandra/commit/fd888bcb Tree: http://git-wip-us.apache.org

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

2014-01-09 Thread brandonwilliams
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/gms/Gossiper.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bef7146c Tree: http://git-wip-us.apache.org/repos/asf/cassandr

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

2014-01-04 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: NEWS.txt src/java/org/apache/cassandra/db/BatchlogManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59c99621 Tree: http://git-wip-us.apache

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

2014-01-03 Thread aleksey
Merge branch 'cassandra-2.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/9ce5e1ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ce5e1ad Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2014-01-02 Thread slebresne
Merge branch 'cassandra-2.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/8165af5d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8165af5d Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-30 Thread yukim
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/service/CassandraDaemon.java test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java Project: http://git-wip-us.apache.org/repos/a

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

2013-12-30 Thread brandonwilliams
Merge branch 'cassandra-2.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/7eaedbf9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7eaedbf9 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-28 Thread aleksey
Merge branch 'cassandra-2.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/4642f5ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4642f5ca Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-26 Thread yukim
Merge branch 'cassandra-2.0' into trunk Conflicts: test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67f9eba7 Tree: http://git-wip-us.apache.org/r

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

2013-12-20 Thread jbellis
Merge branch 'cassandra-2.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/d7536612 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7536612 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-20 Thread jbellis
Merge branch 'cassandra-2.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/8614bea2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8614bea2 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-19 Thread aleksey
Merge branch 'cassandra-2.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/268f3cb1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/268f3cb1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-18 Thread jbellis
Merge branch 'cassandra-2.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/435f1b72 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/435f1b72 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-18 Thread jbellis
Merge branch 'cassandra-2.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/2e4d709d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e4d709d Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-18 Thread slebresne
Merge branch 'cassandra-2.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/d365faab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d365faab Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-17 Thread aleksey
Merge branch 'cassandra-2.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/f943433a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f943433a Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-15 Thread aleksey
Merge branch 'cassandra-2.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/2ee6b8fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ee6b8fd Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-14 Thread jbellis
Merge branch 'cassandra-2.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/9533b587 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9533b587 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-12 Thread jbellis
Merge branch 'cassandra-2.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/611f328f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/611f328f Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-12 Thread jbellis
Merge branch 'cassandra-2.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/b25ae0f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b25ae0f9 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-12 Thread aleksey
Merge branch 'cassandra-2.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/d16d5c4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d16d5c4f Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-09 Thread jbellis
Merge branch 'cassandra-2.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/706058c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/706058c7 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-09 Thread jbellis
Merge branch 'cassandra-2.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/69c18014 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69c18014 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-07 Thread aleksey
Merge branch 'cassandra-2.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/9c0b180a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c0b180a Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-07 Thread aleksey
Merge branch 'cassandra-2.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/5c379c54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c379c54 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-05 Thread brandonwilliams
Merge branch 'cassandra-2.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/e1f2a08f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1f2a08f Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-04 Thread marcuse
Merge branch 'cassandra-2.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/e4d44724 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4d44724 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-02 Thread jbellis
Merge branch 'cassandra-2.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/57516e08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57516e08 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-12-02 Thread slebresne
Merge branch 'cassandra-2.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/cf9baefc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf9baefc Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-28 Thread slebresne
Merge branch 'cassandra-2.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/122bb6b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/122bb6b2 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-27 Thread dbrosius
Merge branch 'cassandra-2.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/99b0076c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99b0076c Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-27 Thread aleksey
Merge branch 'cassandra-2.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/ff44eeb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff44eeb6 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-26 Thread jbellis
Merge branch 'cassandra-2.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/f15d6d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f15d6d59 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-25 Thread aleksey
Merge branch 'cassandra-2.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/4a1b4322 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a1b4322 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-24 Thread aleksey
Merge branch 'cassandra-2.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/f69e043c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f69e043c Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-23 Thread jbellis
Merge branch 'cassandra-2.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/8732fe93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8732fe93 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-21 Thread jbellis
Merge branch 'cassandra-2.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/c550cc82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c550cc82 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-20 Thread jbellis
Merge branch 'cassandra-2.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/c04d74f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04d74f1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-20 Thread jbellis
Merge branch 'cassandra-2.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/ff6f04e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff6f04e3 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-20 Thread jbellis
Merge branch 'cassandra-2.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/ea72d69c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea72d69c Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-19 Thread yukim
Merge branch 'cassandra-2.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/3958a009 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3958a009 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-18 Thread slebresne
Merge branch 'cassandra-2.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/88fbdb11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88fbdb11 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-18 Thread dbrosius
Merge branch 'cassandra-2.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/52cc7efb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52cc7efb Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-16 Thread jbellis
Merge branch 'cassandra-2.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/414ba406 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/414ba406 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-16 Thread jbellis
Merge branch 'cassandra-2.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/48cfe0b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48cfe0b1 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-16 Thread jbellis
Merge branch 'cassandra-2.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/d362ba59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d362ba59 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-15 Thread slebresne
Merge branch 'cassandra-2.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/fab27bd5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fab27bd5 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-13 Thread jbellis
Merge branch 'cassandra-2.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/0619da2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0619da2a Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-11 Thread jbellis
Merge branch 'cassandra-2.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/e9c595b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9c595b5 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-08 Thread aleksey
Merge branch 'cassandra-2.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/9c739eb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c739eb7 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-07 Thread jbellis
Merge branch 'cassandra-2.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/99ad43a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99ad43a8 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-07 Thread aleksey
Merge branch 'cassandra-2.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/26307f96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26307f96 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-06 Thread jasobrown
Merge branch 'cassandra-2.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/c2bd0d8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2bd0d8d Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-05 Thread brandonwilliams
Merge branch 'cassandra-2.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/82c0094a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82c0094a Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

2013-11-01 Thread jbellis
Merge branch 'cassandra-2.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/1fe9a112 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fe9a112 Diff: http://git-wip-us.apache.org/repos/asf/cassand

  1   2   >