Changeset: 401aa484fac1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=401aa484fac1
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
libversions
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (105 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -624,3 +624,6 @@ 51322027cb7e7c27f03fc7c3cab4db4fd4cd4446
51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_SP4_release
192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_1
192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_release
+b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_3
+192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_release
+b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1012,6 +1012,10 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Fri Jun 10 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.3-20160610
+- Rebuilt.
+- BZ#4015: Daemon crashes on database release command
+
* Wed Jun 01 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.1-20160601
- Rebuilt.
- BZ#2407: Merovingian: allow binds to given ip/interface
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monetdb (11.23.3) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#4015: Daemon crashes on database release command
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 10 Jun 2016 13:23:50 +0200
+
monetdb (11.23.1) unstable; urgency=low
* Rebuilt.
diff --git a/java/Makefile.ag b/java/Makefile.ag
--- a/java/Makefile.ag
+++ b/java/Makefile.ag
@@ -16,7 +16,7 @@ JAVA_HOME = @JAVA_HOME@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/monetdb/lib
- FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.20.jar jdbcclient.jar
+ FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.21.jar jdbcclient.jar
}
ant_distmerocontrol = {
diff --git a/java/build.properties b/java/build.properties
--- a/java/build.properties
+++ b/java/build.properties
@@ -19,7 +19,7 @@ MCL_MINOR=13
# major release number
JDBC_MAJOR=2
# minor release number
-JDBC_MINOR=20
+JDBC_MINOR=21
# an additional identifying string
JDBC_VER_SUFFIX=Liberica
# the default port to connect on, if no port given when using SQL
diff --git a/java/pom.xml b/java/pom.xml
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -6,7 +6,7 @@
<groupId>monetdb</groupId>
<artifactId>monetdb-jdbc</artifactId>
- <version>2.20</version>
+ <version>2.21</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>MonetDB JDBC driver</description>
<url>https://www.monetdb.org</url>
diff --git a/java/release.txt b/java/release.txt
--- a/java/release.txt
+++ b/java/release.txt
@@ -1,6 +1,6 @@
RELEASE NOTES
-MonetDB JDBC driver version 2.20 (Liberica/MCL-1.13)
-Release date: 2016-06-01
+MonetDB JDBC driver version 2.21 (Liberica/MCL-1.13)
+Release date: 2016-06-10
This JDBC driver is designed for use with MonetDB, a main-memory
database. For more information see https://www.monetdb.org/.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-GDK_VERSION=13:0:0
+GDK_VERSION=13:1:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=8:0:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=21:0:0
+MONETDB5_VERSION=21:1:0
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=8:0:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
