Merge branch 'development'

UtrechtUniversity · Oct 24, 2016 · ed279da · ed279da
2 parents a21ff56 + d9fe272
commit ed279da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -106,6 +106,11 @@ installed (package names may differ on your platform):
 - `apr-devel`
 - `apr-util-devel`
 - `irods-dev`
+- `make`
+- `gcc`
+- `libstdc++-static`
+- `boost-devel`
+- `jansson-devel`
 
 Additionally, the following runtime dependencies must be installed:
 

diff --git a/davrods-vhost.conf b/davrods-vhost.conf
@@ -127,6 +127,8 @@
 #        #
 #        #DavRodsLockDB          /var/lib/davrods/lockdb_locallock
 #
+#        # }}}
+#
 #    </Location>
 #
 #    # To avoid cleartext password communication we strongly recommend to
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,6 +127,8 @@ @@
     #        #
     #        #DavRodsLockDB          /var/lib/davrods/lockdb_locallock
     #
+    #        # }}}
+    #
     #    </Location>
     #
     #    # To avoid cleartext password communication we strongly recommend to
@@ Expand Down @@