merge changes from 0.6
merge changes from 0.6

git-svn-id: 1e8683751772dd0ef52a45d586103b4a82d616ff@915832 13f79535-47bb-0310-9956-ffa450edef68

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