cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Tue, 22 Jul 2014 17:04:52 GMT
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/e740c297
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e740c297
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e740c297

Branch: refs/heads/cassandra-2.1.0
Commit: e740c297951603947f6aa293a8ffa4c372ed3aef
Parents: df7bd7f 9906a4e
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Tue Jul 22 12:04:34 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Tue Jul 22 12:04:34 2014 -0500

----------------------------------------------------------------------
 doc/cql/CQL.textile | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e740c297/doc/cql/CQL.textile
----------------------------------------------------------------------


Mime
View raw message