Skip to content

Commit 48b4c75

Browse files
committed
Merge branch 'release/4.0.2'
2 parents eac07f5 + 484ad88 commit 48b4c75

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

RoboFileBase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,9 @@ public function devImportDb($sql_file) {
595595
$this->_exec("$this->drush_cmd -y sql-drop");
596596
$this->_exec("$this->drush_cmd sqlq --file=$sql_file");
597597
$this->_exec("$this->drush_cmd cr");
598-
$this->_exec("$this->drush_cmd upwd admin password");
599598
$this->_exec("$this->drush_cmd updb --entity-updates -y");
600599
$this->say('Duration: ' . date_diff(new DateTime(), $start)->format('%im %Ss'));
600+
$this->_exec("$this->drush_cmd upwd admin password");
601601
$this->say('Database imported, admin user password is : password');
602602
}
603603

docker-compose.linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ services:
6363
image: redis:alpine
6464
command: |
6565
redis-server
66-
--maxmemory 512Mi
66+
--maxmemory 512mb
6767
--maxmemory-policy allkeys-lru
6868
--save ""
6969
# --requirepass password

docker-compose.osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ services:
6363
image: redis:alpine
6464
command: |
6565
redis-server
66-
--maxmemory 512Mi
66+
--maxmemory 512mb
6767
--maxmemory-policy allkeys-lru
6868
--save ""
6969
# --requirepass password

0 commit comments

Comments
 (0)