Changeset: c1129122ca90 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c1129122ca90
Modified Files:
MonetDB.spec
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (80 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -463,3 +463,6 @@ 0e42a9ccf4c65e301f76c721ea84e976de6ede84
95911663ea9e3823837168d3f64328360aaf061a Aug2011_SP3_release
600e707d12ac73973bfd4538c11bd340cf6094ae Dec2011_1
d9968eb987609db9990da16db1de57737107502f Dec2011_release
+14ff565c407c49df8512d7a4b29b583b76a505c6 Dec2011_3
+d9968eb987609db9990da16db1de57737107502f Dec2011_release
+6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -625,6 +625,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Tue Jan 17 2012 Sjoerd Mullender <[email protected]> - 11.7.3-20120117
+- Rebuilt.
+
+* Mon Jan 16 2012 Sjoerd Mullender <[email protected]> - 11.7.3-20120117
+- monetdb5: A couple of memory leaks have been plugged.
+
* Wed Jan 11 2012 Sjoerd Mullender <[email protected]> - 11.7.1-20120111
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+monetdb (11.7.3-20120117) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 17 Jan 2012 10:51:40 +0100
+
+monetdb (11.7.3-20120117) unstable; urgency=low
+
+ * monetdb5: A couple of memory leaks have been plugged.
+
+ -- Sjoerd Mullender <[email protected]> Mon, 16 Jan 2012 10:51:39 +0100
+
monetdb (11.7.1-20120111) unstable; urgency=low
* Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -38,7 +38,7 @@ GDK_VERSION=4:4:0
MAPI_VERSION=5:0:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=10:0:0
+MONETDB5_VERSION=10:1:0
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=3:0:0
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,9 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Jan 16 2012 Sjoerd Mullender <[email protected]> - 11.7.3-20120117
+- A couple of memory leaks have been plugged.
+
* Fri Sep 23 2011 Fabian Groffen <[email protected]> - 11.7.1-20120111
- Introduced new variable max_clients that allows to define how many
concurrent connections are allowed to be made against the database.
diff --git a/monetdb5/ChangeLog.Dec2011 b/monetdb5/ChangeLog.Dec2011
--- a/monetdb5/ChangeLog.Dec2011
+++ b/monetdb5/ChangeLog.Dec2011
@@ -1,6 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Mon Jan 16 2012 Sjoerd Mullender <[email protected]>
-- A couple of memory leaks have been plugged.
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
