cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Tue, 23 Jul 2013 17:00:45 GMT
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	build.xml
	debian/changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/283b1a33
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/283b1a33
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/283b1a33

Branch: refs/heads/trunk
Commit: 283b1a33b47e6b9acbd30efd320ec47f8b029af4
Parents: db70bbe 66bd605
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jul 23 19:00:36 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jul 23 19:00:36 2013 +0200

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


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


Mime
View raw message