Merge pull request #360 from peterellisjones/patch-1

Fix bug in grafana admin password reset script

Author: frodenas

jobs/grafana/templates/bin/grafana-admin-password

@@ -18,9 +18,10 @@ if [[ i -gt $retries ]]; then
   exit 1
 fi
 
-/var/vcap/packages/grafana/bin/grafana-cli admin reset-admin-password \
+/var/vcap/packages/grafana/bin/grafana-cli \
   --homepath=/var/vcap/packages/grafana \
   --config=/var/vcap/jobs/grafana/config/grafana.ini \
+  admin reset-admin-password \
   <%= p("grafana.security.admin_password") %>
 
 exit 0