diff options
author | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
---|---|---|
committer | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
commit | 080d2c7799e7d2e3a1378bc94c7d530542a75539 (patch) | |
tree | 4f1f8ce5c697f961dbc53a27669a57297f5e8ea1 /server.conf.example | |
parent | [SERVER] Fix embarrassing deadlock when deleting old images (diff) | |
parent | tiny fix (diff) | |
download | dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.gz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.xz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.zip |
Merge branch 'simon' of dnbd3:dnbd3 into simon
Conflicts:
src/server/altservers.c
Diffstat (limited to 'server.conf.example')
-rw-r--r-- | server.conf.example | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/server.conf.example b/server.conf.example deleted file mode 100644 index 464a870..0000000 --- a/server.conf.example +++ /dev/null @@ -1,9 +0,0 @@ -# This is a sample configuration file for dnbd3-server - -[settings] -default_namespace=uni-freiburg/rz/bunker - -[eclipse-cdt linux (tar.gz)] -file=/home/sr/Downloads/eclipse-cpp-juno-linux-gtk-x86_64.tar.gz -servers=127.0.0.20:1234;132.230.4.58;2000::dead:beef -rid=3 |