| changeset 66606:2f72cb9133d4 |
|---|
| date: | 2018-05-25 11:19 +0200 |
|---|
| user: | Panagiotis Koutsourakis <kutsurak@monetdbsolutions.com> |
|---|
| branch: | default |
|---|
| files: | |
|---|
| message: | Merge with Mar2018 branch |
|---|
| |
| changeset 66607:3b049a938f1e |
|---|
| date: | 2018-05-25 11:34 +0200 |
|---|
| user: | Ying Zhang <y.zhang@cwi.nl> |
|---|
| branch: | default |
|---|
| files: | clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/mclient.c |
|---|
| message: | A new option '-f rowcount': |
|---|
| |
| changeset 66608:0feacc767547 |
|---|
| date: | 2018-05-25 11:52 +0200 |
|---|
| user: | Ying Zhang <y.zhang@cwi.nl> |
|---|
| branch: | default |
|---|
| files: | ChangeLog |
|---|
| message: | Updated changelog for the '-f rowcount' mclient option |
|---|
| |
| changeset 66611:88a93ca0317e |
|---|
| date: | 2018-05-25 11:27 +0200 |
|---|
| user: | Panagiotis Koutsourakis <kutsurak@monetdbsolutions.com> |
|---|
| branch: | default |
|---|
| files: | MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data |
|---|
| message: | Merge with Mar2018 branch, not changing any files. |
|---|
| |
| changeset 66615:6d9df475fc44 |
|---|
| date: | 2018-05-25 11:44 +0200 |
|---|
| user: | Panagiotis Koutsourakis <kutsurak@monetdbsolutions.com> |
|---|
| branch: | default |
|---|
| files: | MonetDB.spec |
|---|
| message: | Merge with Mar2018 branch. |
|---|
| |
| changeset 66617:07fc13e1e728 |
|---|
| date: | 2018-05-25 11:45 +0200 |
|---|
| user: | Panagiotis Koutsourakis <kutsurak@monetdbsolutions.com> |
|---|
| branch: | default |
|---|
| files: | MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data |
|---|
| message: | Merge with Mar2018 branch, not changing any files.. |
|---|
| |
| changeset 66618:8e633ed70cfa |
|---|
| date: | 2018-05-25 14:56 +0200 |
|---|
| user: | Panagiotis Koutsourakis <kutsurak@monetdbsolutions.com> |
|---|
| branch: | default |
|---|
| files: | |
|---|
| message: | Merge heads |
|---|
| |
| changeset 66619:b0c87db02c02 |
|---|
| date: | 2018-05-25 14:04 +0200 |
|---|
| user: | Sjoerd Mullender <sjoerd@acm.org> |
|---|
| branch: | default |
|---|
| files: | clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 sql/backends/monet5/LSST/80_lsst.mal sql/backends/monet5/LSST/Makefile.ag sql/backends/monet5/LSST/Tests/All sql/backends/monet5/LSST/Tests/lsst.sql.src sql/backends/monet5/LSST/Tests/lsst.stable.err sql/backends/monet5/LSST/Tests/lsst.stable.out sql/backends/monet5/LSST/Tests/lsst_htmxmatch.reqtests sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.err sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out sql/backends/monet5/LSST/lsst.c sql/backends/monet5/LSST/lsst.h sql/backends/monet5/LSST/lsst.mal sql/backends/monet5/LSST/lsst.sql sql/backends/monet5/Makefile.ag |
|---|
| message: | Moved LSST to a separate repository. |
|---|
| |
| changeset 66620:f558724237d3 |
|---|
| date: | 2018-05-25 15:31 +0200 |
|---|
| user: | Sjoerd Mullender <sjoerd@acm.org> |
|---|
| branch: | default |
|---|
| files: | monetdb5/ChangeLog testing/README |
|---|
| message: | Changelog blurb. |
|---|
| |