From 44e0b9655a015590e8aea19e296a9aaca1e18a26 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 29 Jun 2012 16:59:00 +0200 Subject: [PATCH 1/3] Update version and NEWS for 1.1.2 release --- .rat-excludes | 1 + NEWS.txt | 9 +++++++++ build.xml | 2 +- debian/changelog | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.rat-excludes b/.rat-excludes index f41d97a08d..a030f84d7b 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -27,6 +27,7 @@ conf/schema-sample.txt drivers/txpy/txcql/cassandra/* drivers/py/cql/cassandra/* doc/cql/CQL* +doc/cql3/CQL* build.properties.default test/data/legacy-sstables/** examples/pig/** diff --git a/NEWS.txt b/NEWS.txt index 8eaf25ea97..9de9f21a33 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -9,6 +9,15 @@ upgrade, just in case you need to roll back to the previous version. by version X, but the inverse is not necessarily the case.) +1.1.2 +===== + +Upgrading +--------- + - Nothing specific to this release, but please see 1.1 if you are upgrading + from a previous version. + + 1.1.1 ===== diff --git a/build.xml b/build.xml index 0622db99af..60903a6cc9 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index 0d6a31abbd..4b97f75c84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.1.2) unstable; urgency=low + + * New release + + -- Sylvain Lebresne Fri, 29 Jun 2012 16:56:29 +0200 + cassandra (1.1.1) unstable; urgency=low * New release From 39bcc8cd9d2d95a8600760be2d55a2b5bc9b3b22 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 29 Jun 2012 17:23:18 +0200 Subject: [PATCH 2/3] Update changelog and news file --- CHANGES.txt | 4 ++++ NEWS.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 65f9fbba3c..eda806c8b3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -25,6 +25,10 @@ * (cql3) Fix deletion bug (CASSANDRA-4193) * Fix computation of overlapping sstable for leveled compaction (CASSANDRA-4321) * Improve scrub and allow to run it offline (CASSANDRA-4321) + * Fix assertionError in StorageService.bulkLoad (CASSANDRA-4368) + * (cqlsh) add option to authenticate to a keyspace at startup (CASSANDRA-4108) + * (cqlsh) fix ASSUME functionality (CASSANDRA-4352) + * Fix ColumnFamilyRecordReader to not return progress > 100% (CASSANDRA-3942) Merged from 1.0: * Set gc_grace on index CF to 0 (CASSANDRA-4314) diff --git a/NEWS.txt b/NEWS.txt index 9de9f21a33..fd7be27178 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -17,6 +17,10 @@ Upgrading - Nothing specific to this release, but please see 1.1 if you are upgrading from a previous version. +Features +-------- + - cqlsh has a new COPY command to load data from CSV flat files + 1.1.1 ===== From b94d8d40fb6f84b4041857bf69ddf7cd22df2e86 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 29 Jun 2012 17:25:12 +0200 Subject: [PATCH 3/3] Add missing sstables for ScrubTest --- .../Keyspace1-Standard3-hd-1-Data.db | Bin 0 -> 498 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 0 -> 66 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 0 -> 4354 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db create mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db create mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db create mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db new file mode 100644 index 0000000000000000000000000000000000000000..45300342a7fd22aa2956205833f6dff2ae38f51b GIT binary patch literal 498 zcmZQzOk{un4@F_OlklC literal 0 HcmV?d00001 diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db new file mode 100644 index 0000000000000000000000000000000000000000..1b5e70883cff5ae1411d9d0cea79f013aa566c00 GIT binary patch literal 256 zcmYjL!4be92#cN%t}izzqc|GRj@8i`P^$5i5CRC`0&oMBL3xd5qqdpxb%SG|*YMcX z2BiE&Hz>rz?nufBnp0xeL!;H8IpOujKmk`BXu*4j=%G%!rW!NW(KKYL0`Fd2Oq7*n9k`2d;b1!DjJ literal 0 HcmV?d00001 diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db new file mode 100644 index 0000000000000000000000000000000000000000..7231157387af17e813fd0fdb1158725234cb2885 GIT binary patch literal 4354 zcmeI!-Ahwp90%~7bGE5dmrm1KG%B?hi6xm?pqaT)BhWO{-pHd4otVnmFp;7tyOA)9 z$^z{bBvg{Ja+=tMrM;IDSyAD|vM_2DX`O%aJ2$sC1Vw1HDeFPo{Tk&eHd#Q`!fz?JcIFU#vzQu882lV!#K%hd7PV= zJfHDy#>W}AG9Ey4%zALkncT*>3(W^J-j5cT?-%MYS7xA9k!W=++JhOd=TFQvy=WgN zdfGv>?kqZJ3tHcgp0fl!{|wrgg^sRAujxdmPDf|YL|ZqYt3-4IvwwR{m^%$%&hQ1D zwGmy9`;&7%gPc#t^UU8v3t5k#zfy_&U)lEna@Cz`u=;Z&*fV_+>@{Hqdrt&_wRyN7 z{Y~#74{Q$t&v>H;&mKqvhdjph4j;qyj;y%}{bL8;g4f04`)$@cATRu=1Mf>|0iPOQ z0k+@5`FU-J`Q$WyBeXvkmv{)gciu(t{q6{AenFf3yYu%ke?t3|=7PQ)_J`2E-HYbR za<5g?s%-->UUiA3oaP>O$0)UzY3(;^Z$k&1C*LgH6Po)8$vxBo(P6NkgSF!)X+Epz z$T0QXWl2}47d+35p^-NcO)n!dsngEvjH1pByS|#b?1%3Vb@lDWMCzvW zQ}d`F)>a;-9=+DTmY7@Uo6}C6n~*@yKi8PrM$bPtc}z>sKW}!txj{b94>qr=AQo(# z<0!E*^sz3PdTeYrT_4r=n&b5U!(&mvP(11HS$nzSDzPTzT#rQTv!nVG9l!R4|1cfD ze_v9oj`W`{R+ZBKgP9lOI*cSY+#S-<^$Pu(m|R8j#Tm{pS`S1;e(2GXJZ|7!$1dXa zbuG>GeYQGRM$!FToMvjMA^j_J?7f4;r(eD9Y#{DBf1!oGucJG>KYA+XbO#>%T0@*% zIP!DoTVOWkidL&woF|FKyaJmsp`@rtv{{PtQ=~kz Wlq#96W~uBCQ$@*Uu~|xr&C+k!b3R)D literal 0 HcmV?d00001