Changeset: dbd3be94d518 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbd3be94d518 Modified Files: .hgtags MonetDB.spec debian/changelog libversions Branch: default Log Message:
Merge with Mar2018 branch. diffs (48 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -697,3 +697,6 @@ 28edc063ceb6a3726af887911a3e4ac4a33c504f f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_release ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_5 ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release +e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_7 +ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release +e96bb94b4c9c3b99e1c33d9c8b49bc3ce7f8e95b Mar2018_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1033,6 +1033,9 @@ done %postun -p /sbin/ldconfig %changelog +* Thu May 31 2018 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.29.7-20180531 +- Rebuilt. + * Fri May 25 2018 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.29.5-20180525 - Rebuilt. - BZ#6562: Sqlitelogictest crash on group by query with not in operator diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.29.7) unstable; urgency=low + + * Rebuilt. + + -- Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> Thu, 31 May 2018 10:17:56 +0200 + monetdb (11.29.5) unstable; urgency=low * Rebuilt. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -42,7 +42,7 @@ GDK_VERSION=16:2:0 MAPI_VERSION=10:1:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=24:2:0 +MONETDB5_VERSION=24:3:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=11:1:0 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
