subject:"\[3\/7\] git commit\: Merge branch 'cassandra\-2.0' into cassandra\-2.1"

[3/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:

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

2014-06-25 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82754e1a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82754e1a Diff: