date:20160610

MonetDB: iot - Fixed imports, created unique mapi connections fo...

2016-06-10 Thread Pedro Ferreira

Changeset: 6c4407fe078d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c4407fe078d
Modified Files:
clients/iotapi/src/Settings/filesystem.py
clients/iotapi/src/Settings/mapiconnection.py
clients/iotapi/src/Streams/datatypes.py
clients/iotapi/src/Streams/streampolling.py
clients/iotapi/src/Streams/streams.py
clients/iotapi/src/Streams/streamscontext.py
clients/iotapi/src/Utilities/customthreading.py
clients/iotapi/src/Utilities/readwritelock.py
clients/iotapi/src/WebSockets/websockets.py
clients/iotapi/src/main.py
clients/iotclient/src/Flask/app.py
clients/iotclient/src/Flask/restresources.py
clients/iotclient/src/Settings/filesystem.py
clients/iotclient/src/Settings/iotlogger.py
clients/iotclient/src/Settings/mapiconnection.py
clients/iotclient/src/Streams/datatypes.py
clients/iotclient/src/Streams/jsonschemas.py
clients/iotclient/src/Streams/streampolling.py
clients/iotclient/src/Streams/streams.py
clients/iotclient/src/Streams/streamscontext.py
clients/iotclient/src/Streams/streamscreator.py
clients/iotclient/src/Utilities/customthreading.py
clients/iotclient/src/Utilities/readwritelock.py
clients/iotclient/src/main.py
clients/iotclient/tests/main.py
Branch: iot
Log Message:

Fixed imports, created unique mapi connections for each stream, fixed small bugs


diffs (truncated from 1302 to 300 lines):

diff --git a/clients/iotapi/src/Settings/filesystem.py 
b/clients/iotapi/src/Settings/filesystem.py
--- a/clients/iotapi/src/Settings/filesystem.py
+++ b/clients/iotapi/src/Settings/filesystem.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-from iotlogger import add_log
+from .iotlogger import add_log
 
 Baskets_Location = None
 
diff --git a/clients/iotapi/src/Settings/mapiconnection.py 
b/clients/iotapi/src/Settings/mapiconnection.py
--- a/clients/iotapi/src/Settings/mapiconnection.py
+++ b/clients/iotapi/src/Settings/mapiconnection.py
@@ -1,7 +1,7 @@
 import sys
 
-import pymonetdb
-from Settings.iotlogger import add_log
+from pymonetdb import connect
+from ..Settings.iotlogger import add_log
 
 Connection = None
 
@@ -10,9 +10,8 @@ def init_monetdb_connection(hostname, po
 global Connection
 
 try:  # the autocommit is set to true so each statement will be independent
-Connection = pymonetdb.connect(hostname=hostname, port=port, 
username=user_name, password=user_password,
-   database=database, autocommit=True)
-Connection.execute("SET SCHEMA iot;")
+Connection = connect(hostname=hostname, port=port, username=user_name, 
password=user_password,
+ database=database, autocommit=True)
 log_message = 'User %s connected successfully to database %s' % 
(user_name, database)
 print log_message
 add_log(20, log_message)
@@ -26,16 +25,26 @@ def close_monetdb_connection():
 Connection.close()
 
 
+def check_hugeint_type():
+Connection.execute("START TRANSACTION")
+cursor = Connection.cursor()
+cursor.execute("SELECT COUNT(*) FROM sys.types WHERE sqlname='hugeint'")
+result = cursor.fetchall()[0][0]
+Connection.commit()
+return result
+
+
 def fetch_streams():
-try:  # TODO paginate results?
+try:
 cursor = Connection.cursor()
 sql_string = """SELECT schemas."name" as schema, tables."name" as 
table, columns."name" as column,
  columns."type", columns."type_digits", columns."type_scale", 
columns."default", columns."null" FROM
  (SELECT "id", "name", "schema_id" FROM sys.tables WHERE type=4) 
AS tables INNER JOIN (SELECT "id", "name"
- FROM sys.schemas) AS schemas ON (tables."schema_id"=schemas."id") 
INNER JOIN  (SELECT "table_id", "name",
+ FROM sys.schemas) AS schemas ON (tables."schema_id"=schemas."id") 
INNER JOIN (SELECT "table_id", "name",
  "type", "type_digits", "type_scale", "default", "null" FROM 
sys.columns) AS columns ON
- (columns."table_id"=tables."id");""".replace('\n', ' ')  # 
important STREAM TABLES TYPE is 4
+ (columns."table_id"=tables."id")""".replace('\n', ' ')
 cursor.execute(sql_string)
 return cursor.fetchall()
 except BaseException as ex:
 add_log(50, ex)
+raise
diff --git a/clients/iotapi/src/Streams/datatypes.py 
b/clients/iotapi/src/Streams/datatypes.py
--- a/clients/iotapi/src/Streams/datatypes.py
+++ b/clients/iotapi/src/Streams/datatypes.py
@@ -1,7 +1,7 @@
 import struct
+
 from abc import ABCMeta, abstractmethod
 from datetime import date, time, datetime
-
 from dateutil.relativedelta import relativedelta
 
 LITTLE_ENDIAN_ALIGNMENT = '<'  # for now is little-endian for Intel CPU's
diff --git a/clients/iotapi/src/Streams/streampolling.py 
b/clients/iotapi/src/Streams/streampolli

MonetDB: default - Merge with Jun2016 branch.

2016-06-10 Thread Sjoerd Mullender

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  - 11.23.3-20160610
+- Rebuilt.
+- BZ#4015: Daemon crashes on database release command
+
 * Wed Jun 01 2016 Sjoerd Mullender  - 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   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 @@
 
monetdb
monetdb-jdbc
-   2.20
+   2.21
${project.groupId}:${project.artifactId}
MonetDB JDBC driver
https://www.monetdb.org
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

MonetDB: Jun2016 - Post release build.

2016-06-10 Thread Sjoerd Mullender

Changeset: dec640bb4d39 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dec640bb4d39
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Jun2016
Log Message:

Post release build.


diffs (truncated from 348 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.23.3
+%define version 11.23.4
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.3"
+"ProductVersion" = "8:11.23.4"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.3"
+"ProductVersion" = "8:11.23.4"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -4296,7 +4296,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.3"
+"ProductVersion" = "8:11.23.4"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.3"
+"ProductVersion" = "8:11.23.4"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.3"
+"ProductVersion" = "8:11.23.4"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj 
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -4296,7 +4296,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.3"
+"ProductVersion" = "8:11.23.4"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -793,7 +793,7 @@
 #define MONETDB5_PASSWDHASH "SHA512"
 
 /* Release name or "unreleased" */
-#define MONETDB_RELEASE "Jun2016"
+#define MONETDB_RELEASE "unreleased"
 
 /* Define if the oid type should use 32 bits on a 64-bit architecture */
 /* #undef MONET_OID32 */
@@ -814,13 +814,13 @@
 #define PACKAGE_NAME "MonetDB"
 
 /* Define to th

MonetDB: default - Merge with Jun2016 branch, not changing any f...

2016-06-10 Thread Sjoerd Mullender

Changeset: 7999f1e71260 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7999f1e71260
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with Jun2016 branch, not changing any files..

___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2016 - Setting tags Jun2016_3 and Jun2016 for the re...

2016-06-10 Thread Sjoerd Mullender

Changeset: b358e53b8ba0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b358e53b8ba0
Modified Files:
.hgtags
Branch: Jun2016
Log Message:

Setting tags Jun2016_3 and Jun2016 for the release build.


diffs (10 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
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2016 - Moved contents of ChangeLog.Jun2016 to MonetD...

2016-06-10 Thread Sjoerd Mullender

Changeset: b29fdfe9c590 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b29fdfe9c590
Modified Files:
MonetDB.spec
debian/changelog
Branch: Jun2016
Log Message:

Moved contents of ChangeLog.Jun2016 to MonetDB.spec, debian/changelog and 
ChangeLog-Archive.


diffs (28 lines):

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  - 11.23.3-20160610
+- Rebuilt.
+- BZ#4015: Daemon crashes on database release command
+
 * Wed Jun 01 2016 Sjoerd Mullender  - 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   Fri, 10 Jun 2016 13:23:50 +0200
+
 monetdb (11.23.1) unstable; urgency=low
 
   * Rebuilt.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2016 - Updated library versions.

2016-06-10 Thread Sjoerd Mullender

Changeset: 4b8f7cff2900 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b8f7cff2900
Modified Files:
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
libversions
Branch: Jun2016
Log Message:

Updated library versions.


diffs (67 lines):

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 @@
 
monetdb
monetdb-jdbc
-   2.20
+   2.21
${project.groupId}:${project.artifactId}
MonetDB JDBC driver
https://www.monetdb.org
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

MonetDB: Jun2016 - Pre-release version number update.

2016-06-10 Thread Sjoerd Mullender

Changeset: ef3c87eb9f8e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef3c87eb9f8e
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Jun2016
Log Message:

Pre-release version number update.


diffs (truncated from 408 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.23.2
+%define version 11.23.3
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB ODBC Driver"
-"ProductCode" = "8:{56A53F48-0D94-41D5-93D0-09C61B2E5E38}"
-"PackageCode" = "8:{215C9638-202A-4AA5-A1B6-B7AE0BA414FA}"
+"ProductCode" = "8:{811D3340-DC2C-45F5-A9B5-8841F8FF7CD8}"
+"PackageCode" = "8:{8C88A0F2-7C19-45AC-9EB3-C0CD58A2F3CC}"
 "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
 "AspNetVersion" = "8:4.0.30319.0"
 "RestartWWWService" = "11:FALSE"
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.2"
+"ProductVersion" = "8:11.23.3"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -431,15 +431,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB5 SQL GIS Module"
-"ProductCode" = "8:{6AC23A86-B46F-4640-8C11-9854D8CAA211}"
-"PackageCode" = "8:{15A23BED-E3BF-4917-8B2D-4D590B95BFD9}"
+"ProductCode" = "8:{56F779A9-E1BA-46F4-A63E-797226D5A19A}"
+"PackageCode" = "8:{3439D424-DF06-45A2-A9BB-CC000218664D}"
 "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
 "AspNetVersion" = "8:4.0.30319.0"
 "RestartWWWService" = "11:FALSE"
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.2"
+"ProductVersion" = "8:11.23.3"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -4288,15 +4288,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB5"
-"ProductCode" = "8:{1C3C3CE1-BBC0-465B-B474-43C62EC8461E}"
-"PackageCode" = "8:{FD8DD830-B38B-4C9A-9FE6-ADCCA6FE435F}"
+"ProductCode" = "8:{FB7D7E3E-9036-4C02-8CDE-16808044AEE7}"
+"PackageCode" = "8:{2129334A-0371-4D0A-BE14-6F26B52AEBA5}"
 "UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
 "AspNetVersion" = "8:4.0.30319.0"
 "RestartWWWService" = "11:FALSE"
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.23.2"
+"ProductVersion" = "8:11.23.3"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB ODBC Driver"
-"ProductCode" = "8:{BCD4DA56-3CC8-457D-B36A-0AA8E213ACD4}"
-"PackageCode" = "8:{69FDE6D5-BDEF-4C83-817D-897083E96FC6}"
+"ProductCode" = "8:{A47CD0FB-5928-4B16-9EAA-B68D0F325065}"
+"PackageCode"

MonetDB: default - Merge with Jun2016 branch, not changing any f...

2016-06-10 Thread Sjoerd Mullender

Changeset: f0c0f3da92ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0c0f3da92ef
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with Jun2016 branch, not changing any files.

___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: iot - Updated create table statement

2016-06-10 Thread Pedro Ferreira

Changeset: 282ddcc5d5c5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=282ddcc5d5c5
Modified Files:
sql/backends/monet5/iot/50_iot.sql
Branch: iot
Log Message:

Updated create table statement


diffs (12 lines):

diff --git a/sql/backends/monet5/iot/50_iot.sql 
b/sql/backends/monet5/iot/50_iot.sql
--- a/sql/backends/monet5/iot/50_iot.sql
+++ b/sql/backends/monet5/iot/50_iot.sql
@@ -106,7 +106,7 @@ create function iot.outputplaces()
 
 -- tables for iotwebserver
 
-CREATE TABLE iot.webserverstreams (table_id INTEGER, has_hostname BOOLEAN, 
base TINYINT, "interval" INTEGER NULL, unit TINYINT NULL);
+CREATE TABLE iot.webserverstreams (table_id INTEGER, base TINYINT, "interval" 
INTEGER NULL, unit TINYINT NULL);
 
 CREATE TABLE iot.webservercolumns (column_id INTEGER, special TINYINT NULL, 
validation1 STRING NULL, validation2 STRING NULL);
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Jun2016 branch.

2016-06-10 Thread Sjoerd Mullender

Changeset: a14ff350c496 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a14ff350c496
Modified Files:
debian/control
Branch: default
Log Message:

Merge with Jun2016 branch.


diffs (21 lines):

diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Maintainer: MonetDB BV http://www.monetdb.org/
 Vcs-Browser: http://dev.monetdb.org/hg/MonetDB/
 Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/
-# for Build-Depends and Depends syntax, see
-# http://www.debian.org/doc/debian-policy/ch-relationships.html
 Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev,
  libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0),
  libgsl0-dev, libpcre3-dev, libreadline-dev, liblzma-dev,
@@ -136,8 +134,6 @@ Description: MonetDB ODBC driver
 
 Package: php5-monetdb-client
 Architecture: all
-# wheezy, jessie, precise, trusty, wily: php5-common
-# xenial: php-common
 Depends: ${shlibs:Depends}, ${misc:Depends}, php-common
 Description: MonetDB php5 client module
  MonetDB is a database management system that is developed from a
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2016 - Remove comments.

2016-06-10 Thread Sjoerd Mullender

Changeset: 1bfd244713e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1bfd244713e3
Modified Files:
debian/control
Branch: Jun2016
Log Message:

Remove comments.
The pbuilder scripts (especially get_source_control_field) don't like them.


diffs (21 lines):

diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Maintainer: MonetDB BV http://www.monetdb.org/
 Vcs-Browser: http://dev.monetdb.org/hg/MonetDB/
 Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/
-# for Build-Depends and Depends syntax, see
-# http://www.debian.org/doc/debian-policy/ch-relationships.html
 Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev,
  libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0),
  libgsl0-dev, libpcre3-dev, libreadline-dev, liblzma-dev,
@@ -136,8 +134,6 @@ Description: MonetDB ODBC driver
 
 Package: php5-monetdb-client
 Architecture: all
-# wheezy, jessie, precise, trusty, wily: php5-common
-# xenial: php-common
 Depends: ${shlibs:Depends}, ${misc:Depends}, php-common
 Description: MonetDB php5 client module
  MonetDB is a database management system that is developed from a
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: iot - Added stream context merge and type checking whil...

2016-06-10 Thread Pedro Ferreira

Changeset: d2138293ca3a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2138293ca3a
Modified Files:
clients/iotapi/src/Streams/streampolling.py
clients/iotclient/src/Settings/mapiconnection.py
clients/iotclient/src/Streams/streampolling.py
clients/iotclient/src/Streams/streams.py
clients/iotclient/src/Streams/streamscontext.py
clients/iotclient/src/Streams/streamscreator.py
Branch: iot
Log Message:

Added stream context merge and type checking while reading created streams from 
the database


diffs (truncated from 565 to 300 lines):

diff --git a/clients/iotapi/src/Streams/streampolling.py 
b/clients/iotapi/src/Streams/streampolling.py
--- a/clients/iotapi/src/Streams/streampolling.py
+++ b/clients/iotapi/src/Streams/streampolling.py
@@ -27,10 +27,10 @@ def init_stream_polling_thread(interval)
 # elem[0] is schema. elem[1] is name, elem[2] is column name, elem[3] is type, 
elem[4] is type_digits
 # elem[5] is type_scale elem[6] is default value elem[7] is nullable
 def stream_polling():
-current_streams = Streams_Context.get_existing_streams()
+array = fetch_streams()  # TODO check whenever stream's columns are updated
 retained_streams = []
 new_streams = {}
-array = fetch_streams()  # TODO check whenever stream's columns are updated
+current_streams = Streams_Context.get_existing_streams()
 
 if array is not None:
 for key, group in groupby(array, lambda x: 
Streams_Context.get_context_entry_name(x[0], x[1])):
@@ -48,5 +48,4 @@ def stream_polling():
 else:
 retained_streams.append(key)
 
-retained_streams_final = [key for key in current_streams if key in 
retained_streams]
-Streams_Context.merge_context(retained_streams_final, new_streams)
+Streams_Context.merge_context(retained_streams, new_streams)
diff --git a/clients/iotclient/src/Settings/mapiconnection.py 
b/clients/iotclient/src/Settings/mapiconnection.py
--- a/clients/iotclient/src/Settings/mapiconnection.py
+++ b/clients/iotclient/src/Settings/mapiconnection.py
@@ -1,5 +1,5 @@
+import pymonetdb
 import sys
-import pymonetdb
 
 from Settings.iotlogger import add_log
 from Streams.streamscontext import IOTStreams
@@ -49,11 +49,11 @@ def mapi_get_webserver_streams():
 try:
 Connection.execute("START TRANSACTION")
 cursor = Connection.cursor()
-sql_string = """SELECT tables."id", schemas."name" AS schema, 
tables."name" AS table, extras."has_hostname",
-extras."base", extras."interval", extras."unit" FROM (SELECT "id", 
"name", "schema_id" FROM sys.tables
-WHERE type=4) AS tables INNER JOIN (SELECT "id", "name" FROM 
sys.schemas) AS schemas ON
-(tables."schema_id"=schemas."id") LEFT JOIN (SELECT "table_id", 
"has_hostname", "base", "interval", "unit"
-FROM iot.webserverstreams) AS extras ON 
(tables."id"=extras."table_id")""".replace('\n', ' ')
+sql_string = """SELECT tables."id", schemas."name" AS schema, 
tables."name" AS table, extras."base",
+extras."interval", extras."unit" FROM (SELECT "id", "name", 
"schema_id" FROM sys.tables WHERE type=4)
+AS tables INNER JOIN (SELECT "id", "name" FROM sys.schemas) AS 
schemas ON (tables."schema_id"=schemas."id")
+LEFT JOIN (SELECT "table_id", "has_hostname", "base", "interval", 
"unit" FROM iot.webserverstreams)
+AS extras ON (tables."id"=extras."table_id")""".replace('\n', ' ')
 cursor.execute(sql_string)
 tables = cursor.fetchall()
 
@@ -72,7 +72,7 @@ def mapi_get_webserver_streams():
 return tables, columns
 except BaseException as ex:
 add_log(50, ex)
-return [], []
+raise
 
 
 def mapi_create_stream(stream):
@@ -98,7 +98,7 @@ def mapi_create_stream(stream):
 "'"]))  # get the created table id
 table_id = str(cursor.fetchall()[0][0])
 cursor.execute(''.join(["INSERT INTO iot.webserverstreams VALUES (", 
table_id, flush_statement, ")"]))
-cursor.execute('SELECT id, "name" FROM sys.columns WHERE table_id=' + 
table_id)
+cursor.execute("SELECT id, \"name\" FROM sys.columns WHERE table_id=" 
+ table_id)
 columns = cursor.fetchall()
 
 inserts = []
@@ -114,6 +114,7 @@ def mapi_create_stream(stream):
 stream.set_delete_ids(table_id, colums_ids)
 except BaseException as ex:
 add_log(50, ex)
+raise
 
 
 def mapi_delete_stream(schema, stream, stream_id, columns_ids):
@@ -125,6 +126,7 @@ def mapi_delete_stream(schema, stream, s
 Connection.commit()
 except BaseException as ex:
 add_log(50, ex)
+raise
 
 
 def mapi_flush_baskets(schema, stream, baskets):
diff --git a/clients/iotclient/src/Streams/streampolling.py 
b/clients/iotclient/src/Streams/streampolling.py
--- a/clients/iotclient/src/Streams/streampolling.py
+++ b/clients/iotclient/src/Streams/stre

MonetDB: default - Merge with Jun2016 branch.

2016-06-10 Thread Sjoerd Mullender

Changeset: 6da88eafadbd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6da88eafadbd
Modified Files:
MonetDB.spec
debian/changelog
debian/control
debian/fix-deb.sh
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
monetdb5/ChangeLog-Archive
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_upgrades.c
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_dump.c
sql/server/rel_prop.c
sql/server/rel_psm.c
sql/storage/bat/bat_logger.c
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:

Merge with Jun2016 branch.


diffs (truncated from 1262 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,7 +9,7 @@
 %define bits 32
 %else
 %define bits 64
-%define with_int128=1
+%define with_int128 1
 %endif
 
 # only add .oidXX suffix if oid size differs from bit size
@@ -695,7 +695,7 @@ fi
 %if %{bits} == 64
 %package -n MonetDB5-server-hugeint
 Summary: MonetDB - 128-bit integer support for MonetDB5-server
-Group: Application/Databases
+Group: Applications/Databases
 Requires: MonetDB5-server%{?_isa}
 
 %description -n MonetDB5-server-hugeint
@@ -910,7 +910,6 @@ Group: Applications/Databases
 Requires: %{name}-testing = %{version}-%{release}
 Requires: %{name}-client-tests = %{version}-%{release}
 Requires: python
-BuildArch: noarch
 
 %description testing-python
 MonetDB is a database management system that is developed from a
@@ -1276,7 +1275,7 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 - gdk: Removed all versions of the SORTloop macro.
 
 * Tue Apr  5 2016 Sjoerd Mullender  - 11.23.1-20160601
-- monetdb5: Removed algerbra.like with a BAT argument.  Use 
algebra.likesubselect
+- monetdb5: Removed algebra.like with a BAT argument.  Use 
algebra.likesubselect
   instead.
 
 * Tue Apr  5 2016 Sjoerd Mullender  - 11.23.1-20160601
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -382,7 +382,7 @@ monetdb (11.23.1) unstable; urgency=low
 
 monetdb (11.23.1) unstable; urgency=low
 
-  * monetdb5: Removed algerbra.like with a BAT argument.  Use 
algebra.likesubselect
+  * monetdb5: Removed algebra.like with a BAT argument.  Use 
algebra.likesubselect
 instead.
 
  -- Sjoerd Mullender   Tue, 5 Apr 2016 16:10:50 +0200
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ X-Python3-Version: >= 3.0
 Package: libmonetdb13
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libmonetdb5-server-geom (< ${source:Version})
 Description: MonetDB core library
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -58,7 +59,8 @@ Description: MonetDB stream library
 
 Package: libmonetdb-stream-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream8
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libmonetdb-stream8 (= ${source:Version})
 Description: MonetDB stream library development files
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -82,7 +84,8 @@ Description: MonetDB

MonetDB: iot - Fixed imports, created unique mapi connections fo...

MonetDB: default - Merge with Jun2016 branch.

MonetDB: Jun2016 - Post release build.

MonetDB: default - Merge with Jun2016 branch, not changing any f...

MonetDB: Jun2016 - Setting tags Jun2016_3 and Jun2016 for the re...

MonetDB: Jun2016 - Moved contents of ChangeLog.Jun2016 to MonetD...

MonetDB: Jun2016 - Updated library versions.

MonetDB: Jun2016 - Pre-release version number update.

MonetDB: default - Merge with Jun2016 branch, not changing any f...

MonetDB: iot - Updated create table statement

MonetDB: default - Merge with Jun2016 branch.

MonetDB: Jun2016 - Remove comments.

MonetDB: iot - Added stream context merge and type checking whil...

MonetDB: default - Merge with Jun2016 branch.

14 matches

Site Navigation

Mail list logo

Footer information