Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 22, 2012
  1. Add an api for CC, which returns a specific service offering

    Haipeng Wu authored
    Get /services/v1/offerings/:label
    
    Change-Id: I47e66278d0782e095b553cafbc904591e25b5571
Commits on May 18, 2012
  1. @kushmerick

    Merge branch 'services-r11'

    kushmerick authored
    - bump vcap/services
    - bump vcap_common gem version to 1.0.12
    
    Conflicts:
    	cloud_controller/Gemfile.lock
    	cloud_controller/vendor/cache/vcap_common-1.0.11.gem
    	common/vcap_common.gemspec
    
    Change-Id: I09534faafb367a6cd2046c7fa4e15700366019e4
Commits on May 16, 2012
  1. Merge "Java and Spring fixes for javaee namespace and use of Annotati…

    Thomas Risberg authored Gerrit Code Review committed
    …onConfigWebApplicationContext"
Commits on May 14, 2012
  1. Java and Spring fixes for javaee namespace and use of AnnotationConfi…

    Thomas Risberg authored
    …gWebApplicationContext
    
     - Fixing Spring autoconfig fails when app is using AnnotationConfigWebApplicationContext (CF-11)
    
     - Handle javaee (or other) namespace if present correctly for all Java based plugins.
    
    Change-Id: I738b10fe02217c804defc92801d7021ca2c5d6bb
Commits on May 12, 2012
  1. @bnugmanov

    bump logging gem and point to git repo with a SHA ref

    bnugmanov authored
    Change-Id: I75260c93f3f6bf977abe937280a1dbf5144d5059
  2. [CC] Remove redundant rm

    mpage authored
    Change-Id: Icba389b9258d737cf5635dca77d02c1256498426
Commits on May 11, 2012
  1. Add Play Framework

    Jennifer Hickey authored
    Change-Id: I57c11bcc01f4ce128f07678be334aa130d9b0460
Commits on May 8, 2012
  1. @mariash

    Merge "[stager] npm support based on shrinkwrap and config option"

    mariash authored Gerrit Code Review committed
Commits on May 7, 2012
  1. [cc][fix] Store droplets using their IDs

    mpage authored
    Previously, we identified droplets using the SHA1 of their contents.
    Any apps with the same source bits that are staged concurrently will
    end up referencing the same file on disk. If one app is deleted,
    any attempts to start more instances of the other app will fail, since
    the droplet being referenced has been deleted. We solve this by
    identifying droplets by application id.
    
    Test plan:
    - Deleted an app that existed prior to deploying the fix. Verified that
      the old droplet (identified by sha1) was deleted.
    - Updated an app that existed prior to deploying the fix. Verified that
      the old droplet was deleted and the new droplet was identified by the
      app id.
    - Increased the instances of an app that existed prior to deploying the
      fix. Verified that the instances were successfully started.
    - Concurrently pushed two apps with the same source bits. Verified that
      two droplets were created.
    - Parallel BVTs pass reliably now.
    
    Change-Id: Ifce771a04092baeacfbd83fd8eb076153bd54835
Commits on May 5, 2012
  1. @mariash

    [stager] npm support based on shrinkwrap and config option

    mariash authored
    Change-Id: Ica5a222abf603f8ffebcdb0f1e6bb0ff0a435f87
Commits on May 4, 2012
  1. Add Ruby back to Rails path

    Jennifer Hickey authored
    - Fixes running tasks like "rake" from rails console
    
    Change-Id: Ibe72db81960758f2f97d4ee05f044d6c2224ff8f
  2. @d

    [CC] Use Git Source for UAA Client

    d authored
      - Fixed CC to work with UAA head
      - Updated uaa client gem to the version without "=" constraint
      - Refer to the uaa client gem using git source, removed old version
        from vendor cache
      - Take transform_git_source from commit 56ca5e6d (Change Icf5dc2df)
      - Rebased on Matt's Stager Client change
    
      Test plan:
        Pass BVTs
    
    Change-Id: Ic2fba5fe903062907f5aaf431bebe465f69a43b8
Commits on May 3, 2012
  1. Decouple Stager and CloudController

    mpage authored
    CC uses StagerClient
    
    Change-Id: I76e60c142af0fece68a34354f8919626e16145b9
  2. Updating staging to use new 0.0.3 version of cf-autoconfig gem

    Thomas Risberg authored
    Change-Id: Iaaa37f67e5cbc945e10e2943e031f803da0b12fb
Commits on May 2, 2012
  1. @kushmerick

    Merge branch 'services-r10'

    kushmerick authored
    Bump vcap/services
    
    Bump version and revendor vcap_common gem
    
    Change-Id: I34bb57d703bc078d0e6488bb4534d21324bee89a
Commits on May 1, 2012
  1. Merge "disable npm support"

    Patrick Bozeman authored Gerrit Code Review committed
  2. @mariash

    disable npm support

    mariash authored
    Change-Id: I6c62a856fe6c3562b3bbb95e090363a4122ce85d
Commits on Apr 30, 2012
  1. [cc][fix] Support legacy paths on CCs not using the stager

    mpage authored
    Change-Id: Ie8800812d91d6367da6530c934402ab66471bb60
  2. @mariash

    [stager] npm support: use HTTP to connect to registry

    mariash authored
    +cleanup
    
    Change-Id: If4fcc9bf05a1c847718f58fe7ff8d69d090f5b0e
  3. @anfernee

    Merge "Merge branch 'router_v2'"

    anfernee authored Gerrit Code Review committed
Commits on Apr 27, 2012
  1. @andl

    add new serialized apis to vcap

    andl authored
    Change-Id: I461b226c7a89c0f810730c907efce19a639649f8
  2. @anfernee

    Merge branch 'router_v2'

    anfernee authored
    Conflicts:
    	dev_setup/cookbooks/nginx/templates/default/ubuntu-nginx.conf.erb
    
    Change-Id: Icdfef01b286ae8b37876809fbccac0327f9a7c06
  3. [cc][fix] Store unstaged apps using id instead of sha1

    mpage authored
    We now reference unstaged app packages (the zipfile that is constructed
    from the resource pool) by app id instead of by sha1 of package contents.
    This fixes a race condition that can occur when two apps are pushed with
    the same source concurrently. Consider the following
    sequence of events:
    
    1. Users A and B push the same app concurrently. Under
       the old scheme, this would result in both apps having the same
       package hash and as a result, referencing the same file on disk.
    2. User A deletes his or her app. This leaves B with a reference to
       a file that no longer exists on disk.
    3. User B attempts to stage his or her application. The stager will be
       unable to retrieve the unstaged app from disk (since User A deleted it)
       and staging will fail. Note that service binding is irrelevant; any
       operation that doesn't change application source would suffice.
    
    Test plan:
    
    - Pushed two apps concurrently. Verified that they referenced different
      files on disk.
    - Bound a service to an app that existed prior to this change. This verifies
      we can reference apps stored at the old location.
    - Updated an existing app. Verified that the app package stored at the old
      location was removed.
    - Deleted an existing app. Verified that the app package stored at the old
      location was removed.
    - BVTs pass.
    
    Change-Id: I23b194d03ca55de64f8f0531ed161cb32d1aa0b0
Commits on Apr 26, 2012
  1. @mariash

    [stager] fix npm support cache (remove unnecessary check)

    mariash authored
    Change-Id: I4bdb720c0ef7f28627f83bf4d47795248a6b5046
Commits on Apr 25, 2012
  1. Bump vcap_logging to 1.0.1

    mpage authored
    Change-Id: Ifad4d2108b1008f6c575437085940fc88090f05a
Commits on Apr 24, 2012
  1. @d

    Merge "[CC] Reject Unsupported Runtimes"

    d authored Gerrit Code Review committed
  2. Merge branch 'master' into services-r11

    figo authored
    Change-Id: Ice6c14e70ca69457e27227bbe253eaabd09dea6d
Commits on Apr 21, 2012
  1. enable new initial placement protocol by default.

    Tal Garfinkel authored
    Change-Id: Iac65918c1cb1a1520eef2717dabb99ae9e8144c9
Commits on Apr 19, 2012
  1. @bnugmanov

    [hm] [cc] [dea] cleanup after crashed droplet if it is flapping.

    bnugmanov authored
    In order to enable continuous attempts to restart an application, DEAs
    need to clean up after crashes.
    
    Until the droplet is declared flapping, its data is not cleaned up, as
    before.
    
    This patch ensures cleanup of flapping droplets in DEA.
    
    Additionally, quiet logging for flapping droplets that are no longer restarted.
    
    Change-Id: I919927bd54f7a64021d8cbd82b33361606910653
Commits on Apr 18, 2012
  1. @bnugmanov

    [cc] [bulk] [fix] ensure valid json is returned by bulk api

    bnugmanov authored
    Change-Id: I1f233298cc2a83b45a266abd270a2167f66809a1
Commits on Apr 17, 2012
  1. @d

    [CC] Reject Unsupported Runtimes

    d authored
      This change will invalidate apps with runtimes not configured in
    Cloud Controller's configuration files.
      The set of supported runtimes are exposed through the /info/runtimes
    API endpoint. A user brave enough to disregard that info (vmc
    runtimes) will now be protected from having a never-started app.
    
      Test plan:
        - pass BVTs on dev_setup
        - pass BVTs on a BOSH deployed instance
        - manually push up a Django app to a Cloud Controller with python2
          removed from config and expect it to fail
    
    Change-Id: I4c96aebb4510030571bf062bb6a50a4a0aa2a630
Commits on Apr 16, 2012
  1. @mariash

    Add npm support

    mariash authored
    - run npm install on stager to recompile native modules
    - provide modules based on package.json dependencies
    - install npm on dev setup
    
    Change-Id: I3e95aaf0982aea77fc280b58fcf965d1342b2ecf
  2. Merge remote branch 'origin/services-r10' into services-r11

    Chunjie authored
    Change-Id: Ib3828c66d6b572402e3bf0e0e70b1294f1f50d28
Commits on Apr 13, 2012
  1. @joeldsa

    Updated cloud_controller that returns UAA tokens

    joeldsa authored
    for filtered email addresses
    Updated gem md5: fed9927968957574e8002ac9b8f67997
    Bumped the uaa submodule pointer
    
    Tested on dev_setup and bosh.
    
    Change-Id: I95765c7a969c8ad1efb9fb40e24b70591ec6c984
  2. @anfernee

    Merge branch 'master' into router_v2

    anfernee authored
    Conflicts:
    	router/Gemfile.lock
    	router/Rakefile
    	router/spec/Rakefile
    	router/spec/functional/router_spec.rb
    	router/spec/functional/spec_helper.rb
    
    Change-Id: I5c91bf1bab78855b05350948dfdfd4e13557432e
Something went wrong with that request. Please try again.