cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 19 Mar 2014 16:44:13 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

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/2a2141ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a2141ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a2141ce

Branch: refs/heads/trunk
Commit: 2a2141ce6505187347613d50e854a6c13af01ceb
Parents: a45fea8 c80f61b
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Wed Mar 19 11:42:45 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Mar 19 11:42:45 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt          |  4 +++-
 doc/cql3/CQL.textile | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a2141ce/doc/cql3/CQL.textile
----------------------------------------------------------------------


Mime
View raw message