[7/8] 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 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/0126760f Tree:

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

2014-10-02 Thread yukim
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/88c71963 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88c71963 Diff:

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

2014-08-05 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/1e0b4c5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e0b4c5e Diff:

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

2014-06-13 Thread brandonwilliams
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/Keyspace.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5871b26b Tree:

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

2014-05-16 Thread mishail
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/b9c9039a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9c9039a Diff:

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

2014-05-10 Thread mishail
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56136946 Tree:

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

2014-04-25 Thread yukim
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/a6efffe5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6efffe5 Diff:

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

2014-03-31 Thread aleksey
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/BatchlogManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5639f44 Tree:

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

2014-03-13 Thread mishail
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/f49df8c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f49df8c9 Diff:

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

2014-02-18 Thread jbellis
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/f628bd8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f628bd8a Diff:

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

2014-02-18 Thread jbellis
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/9416baa5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9416baa5 Diff: