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

2014-09-01 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/DataTracker.java src/java/org/apache/cassandra/db/compaction/LeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-08-27 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/049762b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/049762b3 Diff:

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

2014-08-26 Thread marcuse
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-08-22 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: build.xml src/java/org/apache/cassandra/cql3/statements/BatchStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8da13437 Tree:

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

2014-08-20 Thread aleksey
Merge branch 'cassandra-2.0' 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/58554dec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58554dec Diff:

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

2014-08-19 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/Constants.java src/java/org/apache/cassandra/cql3/UpdateParameters.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit:

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

2014-08-18 Thread aleksey
Merge branch 'cassandra-2.0' 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/fabdd431 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fabdd431 Diff:

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

2014-08-11 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce96a2a1

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

2014-08-06 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/a7d950e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7d950e3 Diff:

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

2014-08-01 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/a09e53cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a09e53cd Diff: