Removed scoped_ptr.hpp inclusion from disk_conflict_resolution.cc.
Removed scoped_ptr.hpp inclusion from disk_conflict_resolution.cc.

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