fix bad merge
fix bad merge

Stratio/stratio-cassandra,mshuler/cassandra,instaclustr/cassandra,knifewine/cassandra,snazy/cassandra,blerer/cassandra,whitepages/cassandra,belliottsmith/cassandra,krummas/cassandra,Bj0rnen/cassandra,pcmanus/cassandra,carlyeks/cassandra,dkua/cassandra,guard163/cassandra,mambocab/cassandra,josh-mckenzie/cassandra,tjake/cassandra,josh-mckenzie/cassandra,ejankan/cassandra,sharvanath/cassandra,regispl/cassandra,helena/cassandra,jbellis/cassandra,ibmsoe/cassandra,AtwooTM/cassandra,cooldoger/cassandra,project-zerus/cassandra,guanxi55nba/db-improvement,ptnapoleon/cassandra,shawnkumar/cstargraph,rdio/cassandra,driftx/cassandra,pofallon/cassandra,vaibhi9/cassandra,phact/cassandra,iamaleksey/cassandra,rmarchei/cassandra,rackerlabs/cloudmetrics-cassandra,codefollower/Cassandra-Research,tommystendahl/cassandra,blerer/cassandra,aboudreault/cassandra,yonglehou/cassandra,bcoverston/cassandra,sriki77/cassandra,strapdata/cassandra,sriki77/cassandra,thelastpickle/cassandra,DikangGu/cassandra,rdio/cassandra,weipinghe/cassandra,thobbs/cassandra,nvoron23/cassandra,nutbunnies/cassandra,MasahikoSawada/cassandra,taigetco/cassandra_read,ben-manes/cassandra,Imran-C/cassandra,jasonstack/cassandra,sayanh/ViewMaintenanceCassandra,hhorii/cassandra,sbtourist/cassandra,xiongzheng/Cassandra-Research,a-buck/cassandra,weipinghe/cassandra,kangkot/stratio-cassandra,rdio/cassandra,fengshao0907/Cassandra-Research,sivikt/cassandra,vaibhi9/cassandra,mkjellman/cassandra,yukim/cassandra,fengshao0907/cassandra-1,knifewine/cassandra,mkjellman/cassandra,DikangGu/cassandra,jasobrown/cassandra,jrwest/cassandra,whitepages/cassandra,stef1927/cassandra,hhorii/cassandra,blambov/cassandra,bmel/cassandra,mike-tr-adamson/cassandra,josh-mckenzie/cassandra,michaelmior/cassandra,jsanda/cassandra,strapdata/cassandra,regispl/cassandra,stef1927/cassandra,swps/cassandra,bpupadhyaya/cassandra,gdusbabek/cassandra,mshuler/cassandra,heiko-braun/cassandra,qinjin/mdtc-cassandra,chbatey/cassandra-1,boneill42/cassandra,mt0803/cassandra,Instagram/cassandra,caidongyun/cassandra,michaelmior/cassandra,szhou1234/cassandra,DICL/cassandra,LatencyUtils/cassandra-stress2,EnigmaCurry/cassandra,JeremiahDJordan/cassandra,Stratio/stratio-cassandra,hengxin/cassandra,blambov/cassandra,Stratio/cassandra,mashuai/Cassandra-Research,DavidHerzogTU-Berlin/cassandraToRun,spodkowinski/cassandra,kangkot/stratio-cassandra,clohfink/cassandra,jrwest/cassandra,ptuckey/cassandra,driftx/cassandra,mike-tr-adamson/cassandra,sedulam/CASSANDRA-12201,fengshao0907/Cassandra-Research,yanbit/cassandra,driftx/cassandra,a-buck/cassandra,pkdevbox/cassandra,sedulam/CASSANDRA-12201,bpupadhyaya/cassandra,ollie314/cassandra,aboudreault/cassandra,matthewtt/cassandra_read,guanxi55nba/key-value-store,RyanMagnusson/cassandra,gdusbabek/cassandra,project-zerus/cassandra,AtwooTM/cassandra,yangzhe1991/cassandra,pcmanus/cassandra,boneill42/cassandra,sayanh/ViewMaintenanceSupport,ifesdjeen/cassandra,dongjiaqiang/cassandra,christian-esken/cassandra,likaiwalkman/cassandra,tommystendahl/cassandra,clohfink/cassandra,beobal/cassandra,christian-esken/cassandra,clohfink/cassandra,qinjin/mdtc-cassandra,shawnkumar/cstargraph,bcoverston/cassandra,beobal/cassandra,yangzhe1991/cassandra,mambocab/cassandra,yukim/cassandra,asias/cassandra,michaelsembwever/cassandra,michaelsembwever/cassandra,jasobrown/cassandra,mt0803/cassandra,mike-tr-adamson/cassandra,ben-manes/cassandra,thobbs/cassandra,ben-manes/cassandra,krummas/cassandra,yonglehou/cassandra,jkni/cassandra,caidongyun/cassandra,jasonstack/cassandra,cooldoger/cassandra,LatencyUtils/cassandra-stress2,Instagram/cassandra,tjake/cassandra,spodkowinski/cassandra,WorksApplications/cassandra,sayanh/ViewMaintenanceCassandra,weideng1/cassandra,iburmistrov/Cassandra,ifesdjeen/cassandra,pthomaid/cassandra,sayanh/ViewMaintenanceSupport,yhnishi/cassandra,aweisberg/cassandra,dongjiaqiang/cassandra,Jollyplum/cassandra,pofallon/cassandra,Jaumo/cassandra,scaledata/cassandra,jasonstack/cassandra,aweisberg/cassandra,ptuckey/cassandra,modempachev4/kassandra,macintoshio/cassandra,adejanovski/cassandra,fengshao0907/cassandra-1,jeffjirsa/cassandra,instaclustr/cassandra,mkjellman/cassandra,iburmistrov/Cassandra,yukim/cassandra,vaibhi9/cassandra,ptnapoleon/cassandra,codefollower/Cassandra-Research,spodkowinski/cassandra,pallavi510/cassandra,ollie314/cassandra,ptuckey/cassandra,ejankan/cassandra,clohfink/cassandra,Imran-C/cassandra,strapdata/cassandra,RyanMagnusson/cassandra,strapdata/cassandra,sluk3r/cassandra,nakomis/cassandra,weideng1/cassandra,rackerlabs/cloudmetrics-cassandra,MasahikoSawada/cassandra,stef1927/cassandra,scaledata/cassandra,wreda/cassandra,matthewtt/cassandra_read,jrwest/cassandra,nlalevee/cassandra,kangkot/stratio-cassandra,tommystendahl/cassandra,jeromatron/cassandra,aarushi12002/cassandra,krummas/cassandra,WorksApplications/cassandra,thelastpickle/cassandra,WorksApplications/cassandra,qinjin/mdtc-cassandra,xiongzheng/Cassandra-Research,snazy/cassandra,scylladb/scylla-tools-java,asias/cassandra,newrelic-forks/cassandra,bdeggleston/cassandra,sbtourist/cassandra,likaiwalkman/cassandra,darach/cassandra,aarushi12002/cassandra,joesiewert/cassandra,mheffner/cassandra-1,yhnishi/cassandra,modempachev4/kassandra,helena/cassandra,exoscale/cassandra,bpupadhyaya/cassandra,adelapena/cassandra,tjake/cassandra,scaledata/cassandra,joesiewert/cassandra,Jaumo/cassandra,EnigmaCurry/cassandra,AtwooTM/cassandra,yanbit/cassandra,guanxi55nba/db-improvement,darach/cassandra,michaelsembwever/cassandra,DikangGu/cassandra,tongjixianing/projects,ejankan/cassandra,jasonwee/cassandra,dkua/cassandra,stef1927/cassandra,blambov/cassandra,pofallon/cassandra,adejanovski/cassandra,nutbunnies/cassandra,bdeggleston/cassandra,apache/cassandra,nitsanw/cassandra,sivikt/cassandra,mambocab/cassandra,Stratio/stratio-cassandra,mashuai/Cassandra-Research,codefollower/Cassandra-Research,lalithsuresh/cassandra-c3,jbellis/cassandra,a-buck/cassandra,szhou1234/cassandra,pauloricardomg/cassandra,snazy/cassandra,juiceblender/cassandra,emolsson/cassandra,nakomis/cassandra,spodkowinski/cassandra,Stratio/cassandra,lalithsuresh/cassandra-c3,carlyeks/cassandra,macintoshio/cassandra,rackerlabs/cloudmetrics-cassandra,nlalevee/cassandra,chaordic/cassandra,xiongzheng/Cassandra-Research,taigetco/cassandra_read,heiko-braun/cassandra,thelastpickle/cassandra,heiko-braun/cassandra,project-zerus/cassandra,DICL/cassandra,jasobrown/cassandra,newrelic-forks/cassandra,jkni/cassandra,LatencyUtils/cassandra-stress2,guard163/cassandra,mkjellman/cassandra,whitepages/cassandra,ibmsoe/cassandra,jrwest/cassandra,nvoron23/cassandra,sluk3r/cassandra,rmarchei/cassandra,miguel0afd/cassandra-cqlMod,aureagle/cassandra,kgreav/cassandra,blambov/cassandra,phact/cassandra,mheffner/cassandra-1,adelapena/cassandra,mike-tr-adamson/cassandra,joesiewert/cassandra,jkni/cassandra,thobbs/cassandra,JeremiahDJordan/cassandra,instaclustr/cassandra,fengshao0907/Cassandra-Research,iamaleksey/cassandra,instaclustr/cassandra,apache/cassandra,bdeggleston/cassandra,likaiwalkman/cassandra,pauloricardomg/cassandra,iburmistrov/Cassandra,jasonwee/cassandra,bmel/cassandra,weideng1/cassandra,exoscale/cassandra,newrelic-forks/cassandra,apache/cassandra,matthewtt/cassandra_read,yanbit/cassandra,thelastpickle/cassandra,adelapena/cassandra,beobal/cassandra,pcn/cassandra-1,juiceblender/cassandra,jeffjirsa/cassandra,belliottsmith/cassandra,driftx/cassandra,pallavi510/cassandra,dongjiaqiang/cassandra,krummas/cassandra,jasonwee/cassandra,yangzhe1991/cassandra,blerer/cassandra,tongjixianing/projects,sharvanath/cassandra,Stratio/stratio-cassandra,ollie314/cassandra,guard163/cassandra,nvoron23/cassandra,fengshao0907/cassandra-1,nakomis/cassandra,adelapena/cassandra,GabrielNicolasAvellaneda/cassandra,exoscale/cassandra,tongjixianing/projects,Imran-C/cassandra,macintoshio/cassandra,nlalevee/cassandra,apache/cassandra,aboudreault/cassandra,shawnkumar/cstargraph,bcoverston/cassandra,yhnishi/cassandra,josh-mckenzie/cassandra,wreda/cassandra,iamaleksey/cassandra,guanxi55nba/db-improvement,EnigmaCurry/cassandra,DavidHerzogTU-Berlin/cassandraToRun,boneill42/cassandra,ifesdjeen/cassandra,yonglehou/cassandra,aweisberg/cassandra,tommystendahl/cassandra,Stratio/cassandra,miguel0afd/cassandra-cqlMod,sriki77/cassandra,pthomaid/cassandra,bcoverston/cassandra,cooldoger/cassandra,chbatey/cassandra-1,JeremiahDJordan/cassandra,chbatey/cassandra-1,jsanda/cassandra,darach/cassandra,modempachev4/kassandra,rogerchina/cassandra,cooldoger/cassandra,GabrielNicolasAvellaneda/cassandra,mheffner/cassandra-1,swps/cassandra,DICL/cassandra,pcmanus/cassandra,RyanMagnusson/cassandra,Stratio/stratio-cassandra,bmel/cassandra,hhorii/cassandra,vramaswamy456/cassandra,lalithsuresh/cassandra-c3,rogerchina/cassandra,ibmsoe/cassandra,belliottsmith/cassandra,jeffjirsa/cassandra,kgreav/cassandra,jeffjirsa/cassandra,Bj0rnen/cassandra,sluk3r/cassandra,mashuai/Cassandra-Research,chaordic/cassandra,pauloricardomg/cassandra,aureagle/cassandra,beobal/cassandra,mt0803/cassandra,aweisberg/cassandra,scylladb/scylla-tools-java,hengxin/cassandra,phact/cassandra,adejanovski/cassandra,aureagle/cassandra,szhou1234/cassandra,jeromatron/cassandra,jsanda/cassandra,ifesdjeen/cassandra,weipinghe/cassandra,pcn/cassandra-1,Jaumo/cassandra,Bj0rnen/cassandra,Jollyplum/cassandra,aarushi12002/cassandra,wreda/cassandra,Jollyplum/cassandra,nutbunnies/cassandra,pkdevbox/cassandra,juiceblender/cassandra,knifewine/cassandra,DavidHerzogTU-Berlin/cassandraToRun,mshuler/cassandra,sivikt/cassandra,michaelsembwever/cassandra,pauloricardomg/cassandra,scylladb/scylla-tools-java,Instagram/cassandra,helena/cassandra,bdeggleston/cassandra,pcn/cassandra-1,rmarchei/cassandra,miguel0afd/cassandra-cqlMod,szhou1234/cassandra,ptnapoleon/cassandra,tjake/cassandra,nitsanw/cassandra,taigetco/cassandra_read,MasahikoSawada/cassandra,swps/cassandra,asias/cassandra,guanxi55nba/key-value-store,regispl/cassandra,sayanh/ViewMaintenanceCassandra,guanxi55nba/key-value-store,yukim/cassandra,kangkot/stratio-cassandra,snazy/cassandra,gdusbabek/cassandra,WorksApplications/cassandra,sharvanath/cassandra,michaelmior/cassandra,Instagram/cassandra,mshuler/cassandra,hengxin/cassandra,sbtourist/cassandra,blerer/cassandra,emolsson/cassandra,kgreav/cassandra,pkdevbox/cassandra,pthomaid/cassandra,caidongyun/cassandra,kgreav/cassandra,GabrielNicolasAvellaneda/cassandra,pallavi510/cassandra,juiceblender/cassandra,rogerchina/cassandra,jasobrown/cassandra,emolsson/cassandra,iamaleksey/cassandra,jeromatron/cassandra,vramaswamy456/cassandra,vramaswamy456/cassandra,belliottsmith/cassandra,nitsanw/cassandra,christian-esken/cassandra,kangkot/stratio-cassandra,dkua/cassandra,sedulam/CASSANDRA-12201,carlyeks/cassandra,chaordic/cassandra,scylladb/scylla-tools-java,jbellis/cassandra