cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/11] git commit: Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Date Fri, 07 Dec 2012 23:34:04 GMT
Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0

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


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

Branch: refs/heads/cassandra-1.2.0
Commit: fbf9f5533e6910aa61e50d43a28e83aecbe1e665
Parents: 904caea d599b3f
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Dec 7 17:29:49 2012 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Dec 7 17:29:49 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------



Mime
View raw message