cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject [1/2] git commit: merge branch cassandra-1.1 into trunk
Date Fri, 19 Oct 2012 02:46:01 GMT
Updated Branches:
  refs/heads/trunk e63a1ae1c -> ebd11d3ad


merge branch cassandra-1.1 into trunk

Conflicts:
	src/java/org/apache/cassandra/service/ClientState.java


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

Branch: refs/heads/trunk
Commit: ebd11d3ada416560c2441d46f32b99cb3c6e747c
Parents: e63a1ae 487c916
Author: Eric Evans <eevans@apache.org>
Authored: Thu Oct 18 21:48:46 2012 -0500
Committer: Eric Evans <eevans@apache.org>
Committed: Thu Oct 18 21:48:46 2012 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message