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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/config/DatabaseDescriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0d25874 Tree: http://git-wip-us.apache.org/repos

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/gms/VersionedValue.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68f9e904 Tree: http://git-wip-us.apache.org/repos/asf/ca

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java src/java/org/apache/cassandra/metrics/StreamingMetrics.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos

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

Merge branch 'cassandra-2.1' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db1cf3e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db1cf3e0 Diff: http://git-wip

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

Merge branch 'cassandra-2.1' 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/65d5ef26 Tree: http://git-wip-us.apache.org/repos/asf/cassandr

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/847f413e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/847f413e Diff: http://git-wip-u

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/config/DatabaseDescriptor.java src/java/org/apache/cassandra/tools/SSTableExport.java src/java/org/apache/cassandra/tools/SSTableImport.java src/java/org/apache/cassandra/tools/Standalo

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

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

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

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

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

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

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java src/java/org/apache/cassandra/service/StorageServiceMBean.java src/java/org/apache/cassandra/tools/NodeProbe.java Project: http://git-wip-us.apache.org/repos/asf/c

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

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

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7208383 Tree: http://git-wip-us.apache.org/repos/asf/

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

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

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

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

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

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

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

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