Merge branch 'master' into devel

.gitlab-ci.yml

@@ -20,7 +20,7 @@ cache:
     - cd gepetto-viewer-corba
     - make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}"
     - make install
-    - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)/build
+    - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
     - make test
 
 robotpkg-gepetto-viewer-corba-14.04-release:
@@ -42,7 +42,7 @@ doc-coverage:
     - echo -e 'CXXFLAGS+= --coverage\nLDFLAGS+= --coverage\nPKG_DEFAULT_OPTIONS= debug' >> /opt/openrobots/etc/robotpkg.conf
   after_script:
     - cd /root/robotpkg/graphics/gepetto-viewer-corba
-    - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)/build
+    - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
     - make doc
     - mv doc/doxygen-html ${CI_PROJECT_DIR}
     - mkdir -p ${CI_PROJECT_DIR}/coverage/
@@ -53,3 +53,4 @@ doc-coverage:
     paths:
       - doxygen-html/
       - coverage/
+

README.md

@@ -245,8 +245,8 @@ ps -C omniNames -o pid,args
 
 If the process is not running, delete omniNames related log and backup files in `/var/lib/omniorb`. They may have different names on your computer, but most likely, something like:
 ```bash
-rm /var/lib/omniORB/omninames-<computer_name>.log
-rm /var/lib/omniORB/omninames-<computer_name>.bak
+sudo rm /var/lib/omniORB/omninames-`hostname`.log
+sudo rm /var/lib/omniORB/omninames-`hostname`.bak
 ```
 then restart the server:
 ```bash