]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'purged_snaps' into testing
authorSage Weil <sage@newdream.net>
Tue, 18 Jan 2011 15:37:58 +0000 (07:37 -0800)
committerSage Weil <sage@newdream.net>
Tue, 18 Jan 2011 15:37:58 +0000 (07:37 -0800)
commit9e7a2b6376017de2db182c025b17f642d2c3a248
treed09f693d7ef5bb6ba2cc9b9f36c4146141f94215
parentafefd737ca8a737dfcad5b50b99862228b1ce531
parent1b3ed0339cc90c9105f854960737eeb36eee32c0
Merge branch 'purged_snaps' into testing
src/osd/OSD.cc
src/osd/PG.cc