diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
| commit | 7f058c5ff743e2cf563b9aa5436ee9801a14e633 (patch) | |
| tree | 8ef0270ede93c304b0859c4e8fba49b9581b2514 /UPGRADE.rst | |
| parent | Add twisted Service interface (diff) | |
| parent | Move experiments, graph and cmdclient into contrib (diff) | |
| download | synapse-7f058c5ff743e2cf563b9aa5436ee9801a14e633.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'UPGRADE.rst')
| -rw-r--r-- | UPGRADE.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/UPGRADE.rst b/UPGRADE.rst index 9618ad2d57..0f81f3e11f 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -52,7 +52,7 @@ resulting conflicts during the upgrade process. Before running the command the homeserver should be first completely shutdown. To run it, simply specify the location of the database, e.g.: - ./database-prepare-for-0.5.0.sh "homeserver.db" + ./scripts/database-prepare-for-0.5.0.sh "homeserver.db" Once this has successfully completed it will be safe to restart the homeserver. You may notice that the homeserver takes a few seconds longer to @@ -147,7 +147,7 @@ rooms the home server was a member of and room alias mappings. Before running the command the homeserver should be first completely shutdown. To run it, simply specify the location of the database, e.g.: - ./database-prepare-for-0.0.1.sh "homeserver.db" + ./scripts/database-prepare-for-0.0.1.sh "homeserver.db" Once this has successfully completed it will be safe to restart the homeserver. You may notice that the homeserver takes a few seconds longer to |