merge from 0.6
merge from 0.6

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

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