Merge changes from topic 'fix-monit-script'
authorAric Gardner <agardner@linuxfoundation.org>
Tue, 29 Nov 2016 12:31:13 +0000 (12:31 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 29 Nov 2016 12:31:13 +0000 (12:31 +0000)
commit27cda9f025a173b4f0f9e90a4aae9774f7f70026
tree2681d555360859b2571614760c23e473220f482a
parentaa11069e56842a36c24946753e13eb611613bb69
parentbbb4a9461e9ee5bf8f2e6ef52627565319cb0c96
Merge changes from topic 'fix-monit-script'

* changes:
  utils: jenkins-jnlp-connect.sh: Make monit actions conditional
  utils: jenkins-jnlp-connect.sh: Fix start up script