Changeset: beeb7ffa185a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=beeb7ffa185a
Modified Files:
.hgtags
MonetDB.spec
cmake/monetdb-versions.cmake
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (93 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -793,3 +793,6 @@ ac8254a47e87d0be9df2a623e2c2fcf67c0f982d
ac8254a47e87d0be9df2a623e2c2fcf67c0f982d Oct2020_SP1_release
929f5e280bc1532a2bfaab127ca7915dc3b69a33 Oct2020_9
929f5e280bc1532a2bfaab127ca7915dc3b69a33 Oct2020_SP2_release
+742b7847cfdcea39a6c19ab29eb35471d46bb2bb Oct2020_11
+929f5e280bc1532a2bfaab127ca7915dc3b69a33 Oct2020_SP2_release
+742b7847cfdcea39a6c19ab29eb35471d46bb2bb Oct2020_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -823,6 +823,10 @@ else
fi
%changelog
+* Mon Jan 18 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.11-20210118
+- Rebuilt.
+- GH#3772: Any user can grant a role.
+
* Mon Jan 11 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.9-20210111
- Rebuilt.
- GH#6862: mserver5: crashes under update_table() when calling lib_sql.so
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -50,7 +50,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
set(GDK_VERSION_CURRENT "22")
-set(GDK_VERSION_REVISION "0")
+set(GDK_VERSION_REVISION "1")
set(GDK_VERSION_AGE "1")
math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_AGE}")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_AGE}.${GDK_VERSION_REVISION}")
@@ -64,7 +64,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_CURRENT "30")
-set(MONETDB5_VERSION_REVISION "3")
+set(MONETDB5_VERSION_REVISION "4")
set(MONETDB5_VERSION_AGE "0")
math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} -
${MONETDB5_VERSION_AGE}")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_AGE}.${MONETDB5_VERSION_REVISION}")
@@ -78,7 +78,7 @@ set(MONETDBE_VERSION "${MONETDBE_VERSION
# version of the STREAM library (subdirectory common/stream)
set(STREAM_VERSION_CURRENT "14")
-set(STREAM_VERSION_REVISION "3")
+set(STREAM_VERSION_REVISION "4")
set(STREAM_VERSION_AGE "0")
math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} -
${STREAM_VERSION_AGE}")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_AGE}.${STREAM_VERSION_REVISION}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monetdb (11.39.11) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#3772: Any user can grant a role.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 18 Jan 2021 14:48:19 +0100
+
monetdb (11.39.9) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,3 +1,10 @@
+monetdb (11.39.11) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#3772: Any user can grant a role.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 18 Jan 2021 14:48:19 +0100
+
monetdb (11.39.9) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,3 +1,7 @@
+* Mon Jan 18 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.11-20210118
+- Rebuilt.
+- GH#3772: Any user can grant a role.
+
* Mon Jan 11 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.9-20210111
- Rebuilt.
- GH#6862: mserver5: crashes under update_table() when calling lib_sql.so
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
