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

2014-02-11 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aac421aa Tree:

[5/5] 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/afd63687 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afd63687 Diff:

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

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

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

2014-02-05 Thread slebresne
Merge branch 'cassandra-2.0' 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/58d1a4f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58d1a4f8 Diff:

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

2014-01-17 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/4e9d1aca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e9d1aca Diff:

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

2014-01-10 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/8ebeee10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ebeee10 Diff:

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

2013-12-20 Thread aleksey
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/ed6584ee Tree:

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

2013-12-17 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/6635cde3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6635cde3 Diff:

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

2013-11-14 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/c41eedf2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c41eedf2 Diff:

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

2013-11-12 Thread slebresne
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/tools/SSTableImport.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfd0144a Tree:

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

2013-10-23 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/cfcc5757 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfcc5757 Diff:

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

2013-10-20 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/0b0c9e41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b0c9e41 Diff:

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

2013-10-18 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/8e0aa710 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e0aa710 Diff:

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

2013-10-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/10c60f5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10c60f5a Diff:

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

2013-10-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/b89cce9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b89cce9c Diff:

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

2013-10-04 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/3da10f46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3da10f46 Diff:

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

2013-09-20 Thread aleksey
Merge branch 'cassandra-2.0' into trunk Conflicts: NEWS.txt build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fb09048 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fb09048

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

2013-09-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/54f41a9f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54f41a9f Diff:

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

2013-09-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/241f7a45 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/241f7a45 Diff:

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

2013-09-03 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/e01186c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e01186c2 Diff:

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

2013-08-22 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/8bc0f599 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bc0f599 Diff:

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

2013-08-21 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/43105f7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43105f7f Diff:

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

2013-08-21 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/99b50404 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99b50404 Diff:

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

2013-08-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/883ed60e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/883ed60e Diff:

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

2013-08-15 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/8f243a91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f243a91 Diff:

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

2013-08-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/0dd3438a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dd3438a Diff: