Merge branch 'replica_ft' of charmgit:charm into replica_ft
authorXiang Ni <xiangni2@illinois.edu>
Fri, 21 Dec 2012 04:14:52 +0000 (22:14 -0600)
committerXiang Ni <xiangni2@illinois.edu>
Fri, 21 Dec 2012 04:14:52 +0000 (22:14 -0600)
commitd67d81d521aab8e4caea79c59ad7f7c12542a531
treeaa460b8e624ef7a333ec2e37e2a841222ad7a309
parent730237a55dce8981708a22f27a74d4e90e6c98d5
parentaeed773821edbdc2ce8fe53ae54f023afc590272
Merge branch 'replica_ft' of charmgit:charm into replica_ft
src/ck-core/ckmemcheckpoint.C