You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/06/25 17:44:06 UTC

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

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: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82754e1a

Branch: refs/heads/trunk
Commit: 82754e1ac554d4b75d0a0a55542da6ac7fdc7fc6
Parents: d27cd39 c656ffe
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Jun 25 09:56:14 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Jun 25 09:56:14 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82754e1a/CHANGES.txt
----------------------------------------------------------------------