diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:09:18 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:09:18 +0000 |
| commit | 50f602fe6b12943a3847fb1925b1e5cb554bed97 (patch) | |
| tree | 2a2ff973dafefa91abcf3295fbca155de6414127 /strata/apache-httpd-server.morph | |
| parent | 655a27dd00b54302978076523f784fe98e5a684f (diff) | |
| parent | fe37ca6dfc32f13e89975f916abb0d95b9b4f09b (diff) | |
| download | infrastructure-50f602fe6b12943a3847fb1925b1e5cb554bed97.tar.gz | |
Merge remote-tracking branch 'baserock/master'
Conflicts:
scripts/licensecheck.sh
strata/lorry-controller.morph
strata/trove.morph
Diffstat (limited to 'strata/apache-httpd-server.morph')
| -rw-r--r-- | strata/apache-httpd-server.morph | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 065ec155..7a403535 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:apache/apr ref: 3c818c6d7351f0130282d212a69035642f5fecad unpetrify-ref: trunk - build-depends: [] - name: httpd morph: strata/apache-httpd-server/httpd-server.morph repo: upstream:apache/httpd @@ -23,7 +22,6 @@ chunks: repo: upstream:python-packages/psutil ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179 unpetrify-ref: release-2.2.0 - build-depends: [] - name: mod_wsgi-metrics repo: upstream:python-packages/mod_wsgi-metrics ref: ec715eb593255229f9f45f3f323edbb845c691d8 |