tree ba2f341c961b1ba9badc2a741cde8686677b6f1a
parent bc8f97c439d1a2feb6d9f2fe69e3e4e89974cabd
parent e7d4f8680f12ea88d22ebb8846af4b7d23f7f57a
author Jiri Broulik <jbroulik@mirantis.com> 1505980415 +0000
committer Gerrit Code Review <gerrit2@37fca7c923f6> 1505980415 +0000

Merge "Allow passing extra java opts and proxy env"