cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 20 Jun 2014 03:05:07 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	pylib/cqlshlib/formatting.py


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

Branch: refs/heads/cassandra-2.1
Commit: 0cdf2b3fc5bc9a07699e99d21f73f911343ede8e
Parents: 6858dd3 37736ab
Author: Mikhail Stepura <mishail@apache.org>
Authored: Fri Jun 20 14:04:29 2014 +1100
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Fri Jun 20 14:04:29 2014 +1100

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


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


Mime
View raw message