diff --git a/.gitignore b/.gitignore index 07b064483948..5ace47789eb1 100755 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ tests/_support/_generated/* tests/_data/scenarios nbproject/* app/config/local/ldap.php +app/storage/dumps/* +app/config/packages/schickling/backup/config.php diff --git a/app/config/packages/schickling/backup/config.example.php b/app/config/packages/schickling/backup/config.example.php index 0cfbb8af61bc..58ce3c483dad 100644 --- a/app/config/packages/schickling/backup/config.example.php +++ b/app/config/packages/schickling/backup/config.example.php @@ -1,6 +1,6 @@ storage_path() . '/dumps/', + 'path' => 'app/storage/dumps/', 'mysql' => array( 'dump_command_path' => '', diff --git a/app/config/version.php b/app/config/version.php index c5a8cf52083c..59d2e018c8ac 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-pre', - 'hash_version' => 'v2.0-pre-beta2-11-g70a7a11', + 'app_version' => 'v2.0-RC', + 'hash_version' => 'v2.0-RC-1', ); \ No newline at end of file