cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Date Wed, 20 Feb 2013 22:59:07 GMT
Updated Branches:
  refs/heads/trunk b6062a5ca -> acf2fd47f


Merge branch 'cassandra-1.2' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java


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

Branch: refs/heads/trunk
Commit: acf2fd47f6f1a7f6a9f301ac14f601dd09b98225
Parents: b6062a5 068b53d
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Feb 20 23:58:58 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Feb 20 23:58:58 2013 +0100

----------------------------------------------------------------------
 debian/changelog             |    6 ++
 pylib/cqlshlib/helptopics.py |  126 +++++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 0 deletions(-)
----------------------------------------------------------------------



Mime
View raw message