Merge branch 'master' of github.com:spring-projects/sts4

2016-11-18 15:26:58 -08:00
parent ab55593628 298758d13d
commit 8b0d633c3a
1 changed files with 15 additions and 0 deletions
--- a/vscode-extensions/vscode-manifest-yaml/test/examples/manifest.yml
+++ b/vscode-extensions/vscode-manifest-yaml/test/examples/manifest.yml
@@ -1,3 +1,4 @@
+inherit: base-manifest.yml
 applications:
 - name: foo
  foo: bar
@@ -13,4 +14,18 @@ applications:
  env:
    RAILS_ENV: production
    RACK_ENV: production
+  no-hostname: true
+  no-route: false
+  random-route: true
+  services:
+  - dbserv1
+  - redisserv2
+  path: app.jar
+  instances: 3
+  stack: cflinuxfs2
+  timeout: 80
+  host: apppage
+  hosts:
+  - apppagealt
+  - anotherhost