Skip to content
This repository has been archived by the owner on Jan 21, 2022. It is now read-only.

Commit

Permalink
Use the most specific runtime versions
Browse files Browse the repository at this point in the history
- Use strict runtime versions

- Bump tests pointer to include tests
with less strict runtime version checking

git shortlog 2b0d072..70bd704f02
Eagle Chen (1):
      mysql max db size enhancement

Frank Lu (1):
      postgresql max db size enhancement

Harshawardhan Gadgil (3):
      Fix readme
      Re-fix README
      Fix redis quota test for redis 2.6

Jennifer Hickey (1):
      Make runtime version checking less strict

Pin Xie (2):
      fix memcached service issue
      remove ruby-debug gem

michael zhang (1):
      bug fix of normal user input

Change-Id: Ice315e2968001088492f0e36a7a40af1195e7472
  • Loading branch information
Jennifer Hickey committed Nov 6, 2012
1 parent 4d887d5 commit 10a5f4a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions jobs/cloud_controller/templates/runtimes.yml
@@ -1,10 +1,10 @@
---
java:
description: Java 6
version: "1.6"
version: "1.6.0_24"
executable: /var/vcap/packages/dea_jvm/bin/java
staging: /var/vcap/packages/ruby/bin/ruby stage
version_output: 1.6.0
version_output: 1.6.0_24
version_flag: '-version'
environment:
PATH: /var/vcap/packages/ruby/bin:/var/vcap/packages/dea_jvm/bin:/var/vcap/packages/imagemagick/bin:$PATH
Expand All @@ -20,10 +20,10 @@ java:
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$VCAP_DEBUG_PORT,server=y,suspend=y"
java7:
description: Java 7
version: "1.7"
version: "1.7.0_04"
executable: /var/vcap/packages/dea_jvm7/bin/java
staging: /var/vcap/packages/ruby/bin/ruby stage
version_output: 1.7.0
version_output: 1.7.0_04
version_flag: '-version'
environment:
PATH: /var/vcap/packages/ruby/bin:/var/vcap/packages/dea_jvm7/bin:/var/vcap/packages/imagemagick/bin:$PATH
Expand Down Expand Up @@ -96,12 +96,12 @@ node08:
- NODE_ARGS="--debug-brk=$VCAP_DEBUG_PORT"
ruby18:
description: Ruby 1.8
version: "1.8.7"
version: "1.8.7p357"
executable: /var/vcap/packages/dea_ruby18/bin/ruby
staging: /var/vcap/packages/ruby/bin/ruby stage
version_output: 1.8.7
version_flag: "-e 'puts RUBY_VERSION'"
additional_checks: "-e 'puts RUBY_PATCHLEVEL >= 174'"
additional_checks: "-e 'puts RUBY_PATCHLEVEL == 357'"
environment:
LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
BUNDLE_GEMFILE:
Expand All @@ -114,7 +114,7 @@ ruby19:
staging: /var/vcap/packages/ruby/bin/ruby stage
version_output: 1.9.2
version_flag: "-e 'puts RUBY_VERSION'"
additional_checks: "-e 'puts RUBY_PATCHLEVEL >= 180'"
additional_checks: "-e 'puts RUBY_PATCHLEVEL == 180'"
environment:
LD_LIBRARY_PATH: '/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib:/var/vcap/packages/imagemagick/lib:$LD_LIBRARY_PATH'
BUNDLE_GEMFILE:
Expand Down
2 changes: 1 addition & 1 deletion src/tests
Submodule tests updated from 2b0d07 to 70bd70

0 comments on commit 10a5f4a

Please sign in to comment.