You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/12/13 02:39:07 UTC

[2/2] incubator-brooklyn git commit: This closes #392

This closes #392

* github/pr/392:
  added NginxConfigFileGenerator to pass in custom server.conf templates to NginxController


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3f645fb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3f645fb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3f645fb9

Branch: refs/heads/master
Commit: 3f645fb914c30695cf0082716edb9e762e6214b3
Parents: b61dbaa 42b5e81
Author: Andrew Kennedy <gr...@apache.org>
Authored: Sat Dec 13 01:39:01 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Dec 13 01:39:01 2014 +0000

----------------------------------------------------------------------
 .../proxy/nginx/NginxConfigFileGenerator.java   | 250 +-----------------
 .../entity/proxy/nginx/NginxConfigTemplate.java |  79 ------
 .../entity/proxy/nginx/NginxController.java     |   8 +-
 .../entity/proxy/nginx/NginxControllerImpl.java |  13 +-
 .../nginx/NginxDefaultConfigGenerator.java      | 256 +++++++++++++++++++
 .../nginx/NginxTemplateConfigGenerator.java     |  78 ++++++
 6 files changed, 353 insertions(+), 331 deletions(-)
----------------------------------------------------------------------