[4/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-10-17 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b84d06f4 Tree:

[4/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-10-16 Thread brandonwilliams
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/432b7319 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/432b7319 Diff:

[4/7] git commit: merge from 2.0

2014-10-01 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/629c9a59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/629c9a59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/629c9a59

[4/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

2014-08-25 Thread slebresne
Merge branch 'cassandra-2.1.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/191cedfd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/191cedfd Diff:

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

2014-07-30 Thread marcuse
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/45968e56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45968e56 Diff:

[4/7] git commit: merge from 2.0

2014-07-23 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b181261c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b181261c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b181261c

[4/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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

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

2014-07-02 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/3e807b65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e807b65 Diff:

[4/7] git commit: merge from 2.0

2014-03-19 Thread jbellis
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1059828 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1059828 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1059828

[4/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

2014-02-17 Thread brandonwilliams
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/2777e1e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2777e1e5 Diff:

[4/7] git commit: merge from 1.2

2014-02-06 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b6913ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b6913ee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b6913ee

[4/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-18 Thread slebresne
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: NEWS.txt src/java/org/apache/cassandra/cql3/QueryProcessor.java src/java/org/apache/cassandra/cql3/statements/BatchStatement.java src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java

[4/7] git commit: merge from 1.2

2013-09-19 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb7b71f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7b71f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb7b71f6

[4/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-09-13 Thread yukim
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab31b217 Tree:

[4/7] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-08-31 Thread jbellis
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd1a703d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd1a703d Diff:

[4/7] git commit: merge from 1.2

2013-08-30 Thread jbellis
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2be42413 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2be42413 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2be42413

[4/7] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

2013-05-02 Thread dbrosius
Merge branch 'cassandra-1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5754ab2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5754ab2 Diff:

[4/7] git commit: Merge

2013-01-04 Thread brandonwilliams
Merge 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/677e247b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/677e247b Diff:

[4/7] git commit: Merge from 1.0

2012-03-19 Thread brandonwilliams
Merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5aa781e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5aa781e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5aa781e

[4/7] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1.0

2012-02-28 Thread brandonwilliams
Merge branch 'cassandra-1.0' into cassandra-1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9454d00 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9454d00 Diff: