merge from 1.0
merge from 1.0

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

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