Changeset: d6595907a95f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6595907a95f
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2012
Branch: default
Log Message:
Merge with Jul2012 branch.
diffs (72 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -486,3 +486,6 @@ 94ffb491c3f2a9dc47c1371760b928bb7d35c050
95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release
99c533046fba872cd4c23cf9a64a0e54d61f6bae Jul2012_1
6cc0a74a5518ce234159fadebcc82976165a5200 Jul2012_release
+40fa73a916e18ecc3becae96a1b424863fd1d927 Jul2012_3
+6cc0a74a5518ce234159fadebcc82976165a5200 Jul2012_release
+8189deaa7dd5956a9bd6d0579519b6872eea2925 Jul2012_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -679,6 +679,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Mon Jul 09 2012 Fabian Groffen <[email protected]> - 11.11.3-20120709
+- Rebuilt.
+
+* Sat Jul 7 2012 Fabian Groffen <[email protected]> - 11.11.3-20120709
+- merovingian: Fixed misc memory leaks, which caused monetdbd to grow in
memory size
+ over time.
+
* Fri Jul 06 2012 Fabian Groffen <[email protected]> - 11.11.1-20120706
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.11.3-20120709) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Fabian Groffen <[email protected]> Mon, 09 Jul 2012 10:05:31 +0200
+
+monetdb (11.11.3-20120709) unstable; urgency=low
+
+ * merovingian: Fixed misc memory leaks, which caused monetdbd to grow in
memory size
+ over time.
+
+ -- Fabian Groffen <[email protected]> Sat, 7 Jul 2012 10:05:31 +0200
+
monetdb (11.11.1-20120706) unstable; urgency=low
* Rebuilt.
diff --git a/tools/merovingian/ChangeLog-Archive
b/tools/merovingian/ChangeLog-Archive
--- a/tools/merovingian/ChangeLog-Archive
+++ b/tools/merovingian/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Sat Jul 7 2012 Fabian Groffen <[email protected]> - 11.11.3-20120709
+- Fixed misc memory leaks, which caused monetdbd to grow in memory size
+ over time.
+
* Wed Jun 13 2012 Fabian Groffen <[email protected]> - 11.11.1-20120706
- Removed erroneously (re-)added master and slave properties, this
functionality is currently not working.
diff --git a/tools/merovingian/ChangeLog.Jul2012
b/tools/merovingian/ChangeLog.Jul2012
--- a/tools/merovingian/ChangeLog.Jul2012
+++ b/tools/merovingian/ChangeLog.Jul2012
@@ -1,7 +1,3 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
-* Sat Jul 7 2012 Fabian Groffen <[email protected]>
-- Fixed misc memory leaks, which caused monetdbd to grow in memory size
- over time.
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
