Made disk_conflict_resolution.cc not use ptr_vector.
Made disk_conflict_resolution.cc not use ptr_vector.

mcanthony/rethinkdb,greyhwndz/rethinkdb,pap/rethinkdb,jesseditson/rethinkdb,bpradipt/rethinkdb,AntouanK/rethinkdb,yaolinz/rethinkdb,gavioto/rethinkdb,niieani/rethinkdb,tempbottle/rethinkdb,ayumilong/rethinkdb,bchavez/rethinkdb,AntouanK/rethinkdb,grandquista/rethinkdb,jmptrader/rethinkdb,yakovenkodenis/rethinkdb,victorbriz/rethinkdb,urandu/rethinkdb,sbusso/rethinkdb,jmptrader/rethinkdb,matthaywardwebdesign/rethinkdb,ajose01/rethinkdb,mcanthony/rethinkdb,sebadiaz/rethinkdb,rrampage/rethinkdb,mquandalle/rethinkdb,bpradipt/rethinkdb,KSanthanam/rethinkdb,victorbriz/rethinkdb,KSanthanam/rethinkdb,spblightadv/rethinkdb,victorbriz/rethinkdb,gavioto/rethinkdb,gdi2290/rethinkdb,bpradipt/rethinkdb,JackieXie168/rethinkdb,robertjpayne/rethinkdb,mbroadst/rethinkdb,grandquista/rethinkdb,yaolinz/rethinkdb,wojons/rethinkdb,mcanthony/rethinkdb,jesseditson/rethinkdb,ayumilong/rethinkdb,jmptrader/rethinkdb,Wilbeibi/rethinkdb,4talesa/rethinkdb,scripni/rethinkdb,losywee/rethinkdb,elkingtonmcb/rethinkdb,wujf/rethinkdb,wujf/rethinkdb,rrampage/rethinkdb,RubenKelevra/rethinkdb,tempbottle/rethinkdb,tempbottle/rethinkdb,mquandalle/rethinkdb,lenstr/rethinkdb,ajose01/rethinkdb,jmptrader/rethinkdb,ayumilong/rethinkdb,gdi2290/rethinkdb,niieani/rethinkdb,yakovenkodenis/rethinkdb,jmptrader/rethinkdb,JackieXie168/rethinkdb,niieani/rethinkdb,pap/rethinkdb,captainpete/rethinkdb,grandquista/rethinkdb,sebadiaz/rethinkdb,sontek/rethinkdb,sbusso/rethinkdb,RubenKelevra/rethinkdb,eliangidoni/rethinkdb,mbroadst/rethinkdb,elkingtonmcb/rethinkdb,gavioto/rethinkdb,Qinusty/rethinkdb,pap/rethinkdb,spblightadv/rethinkdb,ayumilong/rethinkdb,greyhwndz/rethinkdb,robertjpayne/rethinkdb,dparnell/rethinkdb,Wilbeibi/rethinkdb,robertjpayne/rethinkdb,gdi2290/rethinkdb,tempbottle/rethinkdb,wojons/rethinkdb,wujf/rethinkdb,KSanthanam/rethinkdb,dparnell/rethinkdb,victorbriz/rethinkdb,ajose01/rethinkdb,Qinusty/rethinkdb,mbroadst/rethinkdb,marshall007/rethinkdb,niieani/rethinkdb,bchavez/rethinkdb,bchavez/rethinkdb,JackieXie168/rethinkdb,bpradipt/rethinkdb,wojons/rethinkdb,ajose01/rethinkdb,bchavez/rethinkdb,pap/rethinkdb,matthaywardwebdesign/rethinkdb,eliangidoni/rethinkdb,wkennington/rethinkdb,KSanthanam/rethinkdb,sbusso/rethinkdb,RubenKelevra/rethinkdb,mcanthony/rethinkdb,catroot/rethinkdb,AntouanK/rethinkdb,wujf/rethinkdb,gavioto/rethinkdb,jesseditson/rethinkdb,ayumilong/rethinkdb,tempbottle/rethinkdb,lenstr/rethinkdb,bchavez/rethinkdb,alash3al/rethinkdb,wkennington/rethinkdb,grandquista/rethinkdb,KSanthanam/rethinkdb,mcanthony/rethinkdb,ayumilong/rethinkdb,mcanthony/rethinkdb,catroot/rethinkdb,ajose01/rethinkdb,catroot/rethinkdb,marshall007/rethinkdb,wkennington/rethinkdb,urandu/rethinkdb,dparnell/rethinkdb,dparnell/rethinkdb,yaolinz/rethinkdb,losywee/rethinkdb,lenstr/rethinkdb,mbroadst/rethinkdb,JackieXie168/rethinkdb,4talesa/rethinkdb,mbroadst/rethinkdb,rrampage/rethinkdb,urandu/rethinkdb,JackieXie168/rethinkdb,gdi2290/rethinkdb,sbusso/rethinkdb,losywee/rethinkdb,wkennington/rethinkdb,scripni/rethinkdb,grandquista/rethinkdb,4talesa/rethinkdb,Wilbeibi/rethinkdb,gdi2290/rethinkdb,spblightadv/rethinkdb,alash3al/rethinkdb,Qinusty/rethinkdb,sbusso/rethinkdb,mbroadst/rethinkdb,niieani/rethinkdb,sbusso/rethinkdb,victorbriz/rethinkdb,sontek/rethinkdb,JackieXie168/rethinkdb,elkingtonmcb/rethinkdb,jesseditson/rethinkdb,marshall007/rethinkdb,yaolinz/rethinkdb,pap/rethinkdb,sontek/rethinkdb,yaolinz/rethinkdb,jesseditson/rethinkdb,AntouanK/rethinkdb,Qinusty/rethinkdb,bpradipt/rethinkdb,matthaywardwebdesign/rethinkdb,yakovenkodenis/rethinkdb,gavioto/rethinkdb,greyhwndz/rethinkdb,dparnell/rethinkdb,yakovenkodenis/rethinkdb,urandu/rethinkdb,spblightadv/rethinkdb,greyhwndz/rethinkdb,wojons/rethinkdb,victorbriz/rethinkdb,matthaywardwebdesign/rethinkdb,bchavez/rethinkdb,yakovenkodenis/rethinkdb,Wilbeibi/rethinkdb,grandquista/rethinkdb,sontek/rethinkdb,catroot/rethinkdb,captainpete/rethinkdb,matthaywardwebdesign/rethinkdb,JackieXie168/rethinkdb,victorbriz/rethinkdb,sebadiaz/rethinkdb,catroot/rethinkdb,sbusso/rethinkdb,robertjpayne/rethinkdb,Wilbeibi/rethinkdb,urandu/rethinkdb,lenstr/rethinkdb,rrampage/rethinkdb,mcanthony/rethinkdb,sontek/rethinkdb,spblightadv/rethinkdb,wujf/rethinkdb,RubenKelevra/rethinkdb,eliangidoni/rethinkdb,eliangidoni/rethinkdb,dparnell/rethinkdb,scripni/rethinkdb,sontek/rethinkdb,4talesa/rethinkdb,gdi2290/rethinkdb,losywee/rethinkdb,4talesa/rethinkdb,niieani/rethinkdb,gavioto/rethinkdb,JackieXie168/rethinkdb,niieani/rethinkdb,mquandalle/rethinkdb,sebadiaz/rethinkdb,wkennington/rethinkdb,robertjpayne/rethinkdb,urandu/rethinkdb,pap/rethinkdb,wkennington/rethinkdb,eliangidoni/rethinkdb,captainpete/rethinkdb,victorbriz/rethinkdb,pap/rethinkdb,bpradipt/rethinkdb,captainpete/rethinkdb,urandu/rethinkdb,KSanthanam/rethinkdb,eliangidoni/rethinkdb,eliangidoni/rethinkdb,lenstr/rethinkdb,matthaywardwebdesign/rethinkdb,elkingtonmcb/rethinkdb,greyhwndz/rethinkdb,Qinusty/rethinkdb,robertjpayne/rethinkdb,mbroadst/rethinkdb,AntouanK/rethinkdb,RubenKelevra/rethinkdb,wojons/rethinkdb,rrampage/rethinkdb,captainpete/rethinkdb,RubenKelevra/rethinkdb,scripni/rethinkdb,Wilbeibi/rethinkdb,Wilbeibi/rethinkdb,alash3al/rethinkdb,ajose01/rethinkdb,captainpete/rethinkdb,Qinusty/rethinkdb,elkingtonmcb/rethinkdb,jmptrader/rethinkdb,mquandalle/rethinkdb,captainpete/rethinkdb,marshall007/rethinkdb,catroot/rethinkdb,elkingtonmcb/rethinkdb,mcanthony/rethinkdb,jmptrader/rethinkdb,sbusso/rethinkdb,tempbottle/rethinkdb,wojons/rethinkdb,sebadiaz/rethinkdb,scripni/rethinkdb,robertjpayne/rethinkdb,robertjpayne/rethinkdb,wujf/rethinkdb,dparnell/rethinkdb,marshall007/rethinkdb,niieani/rethinkdb,lenstr/rethinkdb,wojons/rethinkdb,Wilbeibi/rethinkdb,scripni/rethinkdb,gavioto/rethinkdb,losywee/rethinkdb,urandu/rethinkdb,yaolinz/rethinkdb,catroot/rethinkdb,Qinusty/rethinkdb,sebadiaz/rethinkdb,AntouanK/rethinkdb,pap/rethinkdb,sebadiaz/rethinkdb,spblightadv/rethinkdb,grandquista/rethinkdb,alash3al/rethinkdb,mquandalle/rethinkdb,sebadiaz/rethinkdb,gdi2290/rethinkdb,gavioto/rethinkdb,sontek/rethinkdb,matthaywardwebdesign/rethinkdb,JackieXie168/rethinkdb,4talesa/rethinkdb,ajose01/rethinkdb,bchavez/rethinkdb,ajose01/rethinkdb,greyhwndz/rethinkdb,spblightadv/rethinkdb,4talesa/rethinkdb,eliangidoni/rethinkdb,RubenKelevra/rethinkdb,grandquista/rethinkdb,marshall007/rethinkdb,scripni/rethinkdb,KSanthanam/rethinkdb,lenstr/rethinkdb,rrampage/rethinkdb,marshall007/rethinkdb,greyhwndz/rethinkdb,mquandalle/rethinkdb,robertjpayne/rethinkdb,elkingtonmcb/rethinkdb,yakovenkodenis/rethinkdb,catroot/rethinkdb,yakovenkodenis/rethinkdb,bpradipt/rethinkdb,alash3al/rethinkdb,dparnell/rethinkdb,eliangidoni/rethinkdb,lenstr/rethinkdb,yakovenkodenis/rethinkdb,tempbottle/rethinkdb,jesseditson/rethinkdb,ayumilong/rethinkdb,tempbottle/rethinkdb,marshall007/rethinkdb,greyhwndz/rethinkdb,AntouanK/rethinkdb,Qinusty/rethinkdb,matthaywardwebdesign/rethinkdb,dparnell/rethinkdb,jesseditson/rethinkdb,losywee/rethinkdb,yaolinz/rethinkdb,RubenKelevra/rethinkdb,losywee/rethinkdb,Qinusty/rethinkdb,AntouanK/rethinkdb,elkingtonmcb/rethinkdb,ayumilong/rethinkdb,jmptrader/rethinkdb,jesseditson/rethinkdb,alash3al/rethinkdb,alash3al/rethinkdb,spblightadv/rethinkdb,bpradipt/rethinkdb,rrampage/rethinkdb,4talesa/rethinkdb,wkennington/rethinkdb,mbroadst/rethinkdb,rrampage/rethinkdb,yaolinz/rethinkdb,bchavez/rethinkdb,mquandalle/rethinkdb,KSanthanam/rethinkdb,mbroadst/rethinkdb,mquandalle/rethinkdb,wkennington/rethinkdb,grandquista/rethinkdb,alash3al/rethinkdb,sontek/rethinkdb,losywee/rethinkdb,captainpete/rethinkdb,wujf/rethinkdb,bpradipt/rethinkdb,scripni/rethinkdb,wojons/rethinkdb,bchavez/rethinkdb