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

2014-10-23 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 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/1467118f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1467118f Diff:

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

2014-09-03 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/statements/SelectStatement.java test/unit/org/apache/cassandra/cql3/MultiColumnRelationTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo

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

2014-08-22 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6434ad8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6434ad8b Diff:

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

2014-08-21 Thread tylerhobbs
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/664efd41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/664efd41 Diff:

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

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

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

2014-08-19 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/auth/PasswordAuthenticator.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5df5f32a Tree:

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

2014-05-13 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09feef30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09feef30 Diff:

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

2014-04-25 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/cql3/CFDefinition.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9f180ca Tree:

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

2014-03-04 Thread slebresne
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java Project: