fix merge conflict
fix merge conflict

git-svn-id: af0234e1aff5c580ad966c5a1be7e5402979d927@1144730 13f79535-47bb-0310-9956-ffa450edef68

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