2 Commits

Author	SHA1	Message	Date
Jonathan Ellis	ae7dbe3d2a	merge from 0.8 ... git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1125113 13f79535-47bb-0310-9956-ffa450edef68	2011-05-19 21:19:30 +00:00
Eric Evans	dabb5c94fd	merging w/ 0.5 branch ... git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@903504 13f79535-47bb-0310-9956-ffa450edef68	2010-01-26 23:56:57 +00:00