Changeset: 880ac2acd5de for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=880ac2acd5de Modified Files: .hgtags MonetDB.spec clients/ChangeLog-Archive clients/ChangeLog.Apr2012 debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Apr2012 libversions Branch: Jul2012 Log Message:
Merge with Apr2012 branch. diffs (144 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -482,3 +482,5 @@ 4a6a6523c78992de5d3a1e7a72454250f4964881 cbc7f297899d61201e4d5a8cb06ae3aacf070111 Apr2012_SP1_release ebb4a17093e63a199a1d5d27855aa8a31c7e7785 Apr2012_SP1_release 06c3e1846c2fc399d72edcac1ed0d877934fab67 Jun2012_root +94ffb491c3f2a9dc47c1371760b928bb7d35c050 Apr2012_7 +95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Apr2012-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Apr2012-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -655,6 +655,19 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Thu Jun 07 2012 Sjoerd Mullender <sjo...@acm.org> - 11.9.7-20120607 +- Rebuilt. + +* Wed May 23 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.7-20120607 +- clients: Resolved a cosmetical error where tab-characters would cause + misalignments in tabular result views. For the time being, tabs are + now represented as a single space in tabular view. + +* Thu May 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.7-20120607 +- gdk: Limit number of detected CPU cores to 16 on 32-bits systems to avoid + running quickly out of addressable resources followed by a kill from + the OS. + * Wed May 16 2012 Fabian Groffen <fab...@monetdb.org> - 11.9.5-20120516 - Rebuilt. diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed May 23 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.7-20120607 +- Resolved a cosmetical error where tab-characters would cause + misalignments in tabular result views. For the time being, tabs are + now represented as a single space in tabular view. + * Fri Mar 9 2012 Sjoerd Mullender <sjo...@acm.org> - 11.9.1-20120418 - ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute. diff --git a/clients/ChangeLog.Apr2012 b/clients/ChangeLog.Apr2012 --- a/clients/ChangeLog.Apr2012 +++ b/clients/ChangeLog.Apr2012 @@ -1,8 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Wed May 23 2012 Fabian Groffen <fab...@cwi.nl> -- Resolved a cosmetical error where tab-characters would cause - misalignments in tabular result views. For the time being, tabs are - now represented as a single space in tabular view. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +monetdb (11.9.7-20120607) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 07 Jun 2012 11:36:25 +0200 + +monetdb (11.9.7-20120607) unstable; urgency=low + + * clients: Resolved a cosmetical error where tab-characters would cause + misalignments in tabular result views. For the time being, tabs are + now represented as a single space in tabular view. + + -- Fabian Groffen <fab...@cwi.nl> Wed, 23 May 2012 11:36:24 +0200 + +monetdb (11.9.7-20120607) unstable; urgency=low + + * gdk: Limit number of detected CPU cores to 16 on 32-bits systems to avoid + running quickly out of addressable resources followed by a kill from + the OS. + + -- Fabian Groffen <fab...@cwi.nl> Thu, 17 May 2012 11:36:24 +0200 + monetdb (11.9.5-20120516) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,11 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu May 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.7-20120607 +- Limit number of detected CPU cores to 16 on 32-bits systems to avoid + running quickly out of addressable resources followed by a kill from + the OS. + * Fri Apr 27 2012 Fabian Groffen <fab...@cwi.nl> - 11.9.3-20120514 - Implemented MT_getrss for Mac OS X systems, this allows the server to know about how much memory is currently in use. diff --git a/gdk/ChangeLog.Apr2012 b/gdk/ChangeLog.Apr2012 --- a/gdk/ChangeLog.Apr2012 +++ b/gdk/ChangeLog.Apr2012 @@ -1,8 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Thu May 17 2012 Fabian Groffen <fab...@cwi.nl> -- Limit number of detected CPU cores to 16 on 32-bits systems to avoid - running quickly out of addressable resources followed by a kill from - the OS. - diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -35,13 +35,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=5:1:0 +GDK_VERSION=5:2:0 # version of the MAPI library (subdirectory clients/mapilib) -MAPI_VERSION=6:0:0 +MAPI_VERSION=6:1:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=11:1:0 +MONETDB5_VERSION=11:2:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=4:1:1 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
