Merge branch 'develop' into dist/eole/2.7.0/develop

2019-05-20 10:44:58 +02:00 · 2019-05-16 10:29:55 +02:00 · 2019-04-18 15:01:21 +02:00 · 2019-04-18 14:56:37 +02:00 · 2019-04-18 14:53:36 +02:00 · 2019-03-13 15:20:06 +01:00
3 changed files with 4 additions and 4 deletions
--- a/4
+++ b/4
@ -4,8 +4,8 @@

 SOURCE=eole-mariadb
 VERSION=0.0.1
-EOLE_VERSION=2.7
-EOLE_RELEASE=2.7.1
+EOLE_VERSION=2.6
+EOLE_RELEASE=2.6.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>

--- a/debian/control
+++ b/debian/control
@ -10,7 +10,7 @@ Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-mariadb

 Package: eole-mariadb
 Architecture: all
-Depends: ${misc:Depends}, mariadb-server, mariadb-backup
+Depends: ${misc:Depends}, mariadb-server
 Conflicts: eole-mysql
 Provides: eole-mysql
 Description: Dictionnaires et templates pour la configuration d'un serveur MariaDB, testée uniquement avec eolebase
--- a/schedule/scripts/mariadb
+++ b/schedule/scripts/mariadb
@ -19,7 +19,7 @@ for databasename in $DATABASES; do
            continue
            ;;
        *)
-            mysqldump --defaults-file=/etc/mysql/debian.cnf --databases $databasename --flush-privileges --create-options -Q -c $OPTION > $MYSQLSAVDIR/$databasename.sql
+            mysqldump --defaults-file=/etc/mysql/debian.cnf --databases $databasename --flush-privileges --create-options -Q -c $OPTION 2>/dev/null > $MYSQLSAVDIR/$databasename.sql
            ;;
    esac
 done
Author	SHA1	Message	Date
vincent	51811c96db	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-05-20 10:44:58 +02:00
vincent	b9fb5ff6ad	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-05-16 10:29:55 +02:00
vincent	b609ee9761	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-04-18 15:01:21 +02:00
vincent	3f214856a4	XMerge branch 'dist/eole/2.7.0/develop' of ssh://forge.cadoles.com:4242/Cadoles/eole-mariadb into dist/eole/2.7.0/develop	2019-04-18 14:56:37 +02:00
vincent	cbc84bd841	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-04-18 14:53:36 +02:00
Teddy Cornaut	0c455115c8	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-03-13 15:20:06 +01:00
vincent	a0684dab2f	Merge branch 'dist/eole/2.7.0/develop' of ssh://forge.cadoles.com:4242/Cadoles/eole-mariadb into dist/eole/2.7.0/develop	2019-03-11 09:47:34 +01:00
vincent	997e33daf2	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-03-11 09:45:26 +01:00
vincent	79785b4b60	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-03-04 12:08:27 +01:00
vincent	c3040e3762	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-03-04 10:29:23 +01:00
vincent	2ba4b56d51	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-03-01 15:36:10 +01:00
vincent	065308a921	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-02-19 17:26:31 +01:00
vincent	21b93a3462	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-02-19 17:13:59 +01:00
vincent	c540b65e08	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-02-19 10:03:53 +01:00
vincent	5e9eae5c13	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-02-15 11:07:15 +01:00