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

2014-09-03 Thread jasobrown
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/0de4135f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0de4135f Diff:

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

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

[4/6] 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 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18112812 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18112812 Diff:

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

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

[4/6] 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: