Permalink
Commits on May 29, 2012
  1. Merge changes I95567126,I79538afb into services-r12

    kushmerick authored and Gerrit Code Review committed May 29, 2012
    * changes:
      Bump vcap_common to include mongolab gateway fix
      Add cf_plan_id in service api & ccdb
Commits on May 28, 2012
  1. [dev_setup] postgresql service could use standalone postgresql

    Frank Lu
    Frank Lu committed May 28, 2012
    1. ccdb, acmdb, uuadb will use postgresql 8.4 (port 5432) by default, so you could upgrade dev setup without any migration.
    2. postgresql service uses postgresql 9.0 (port 5433) by default
    
    Change-Id: Ib0fd2a923e10fea3896c8f1120abc48b7daf300b
Commits on May 24, 2012
  1. Bump vcap_common to include mongolab gateway fix

    felixhoo
    felixhoo committed May 24, 2012
    Change-Id: I955671269b23a6c33165a121ac51300870322495
  2. Add FSS support for dev_setup

    felixhoo
    felixhoo committed May 21, 2012
    Change-Id: Iac1e4ae2deb8ea880ff9671a8e495a51ddc0fdcd
Commits on May 23, 2012
  1. support multi service_broker

    Chunjie
    Chunjie committed May 17, 2012
    Change-Id: Idac221b43011b1602606c6fe01e7f5249ce328b9
  2. Add cf_plan_id in service api & ccdb

    felixhoo
    felixhoo committed May 11, 2012
    Change-Id: I79538afb50f629718c780f8c3a61d39bb263fd5b
Commits on May 22, 2012
  1. Merge branch 'master' into services-r12

    felixhoo
    felixhoo committed May 22, 2012
    Conflicts:
    	dev_setup/cookbooks/cloud_controller/attributes/default.rb
    	dev_setup/lib/job_manager.rb
    
    Change-Id: I3bcecd9b7d86472c58efdbd779076391c4b0c781
  2. Merge "Add an api for CC, which returns a specific service offering G…

    Haipeng Wu Gerrit Code Review
    Haipeng Wu authored and Gerrit Code Review committed May 22, 2012
    …et /services/v1/offerings/:label"
  3. Merge "mkae nuke_service.rb path to be correct."

    Chunjie Gerrit Code Review
    Chunjie authored and Gerrit Code Review committed May 22, 2012
  4. Add an api for CC, which returns a specific service offering

    Haipeng Wu
    Haipeng Wu committed May 15, 2012
    Get /services/v1/offerings/:label
    
    Change-Id: I47e66278d0782e095b553cafbc904591e25b5571
Commits on May 21, 2012
  1. [stager] Add license and notice to stager

    d committed May 21, 2012
      This change adds a license and notice file to the stager sub dir in
    preparation for giving it its own repo.
    
    Change-Id: I7fbdd2895b4d556f9439ae900b461ad7955ab798
  2. [dev_setup] Fix Chef regression

    d committed May 16, 2012
      This change replaces the use of remote_file with cf_remote_file to
    work around two limitations in Chef 0.10:
      - Chef shares its downloading logic of remote_file with its REST
        client.  The REST client decompresses archives when it sees the
        header "Content-Encoding: gzip", which is an undesirable behavior
        for remote_file.
      - Chef only uses the specified checksum to trigger update, but it does
        no validation after new remote files are downloaded.
    
      Our requirement of cf_remote_file:
      - Don't do content decoding magic
      - checksum required and *always* validates the checksum
    
      Test plan: remove locally compiled ruby and the cached tarballs, run
    dev_setup.
    
    Change-Id: Ifb91188ec7ec2f77fafc671d128625ec0f8f1c77
  3. Merge "Dev setup support for memcached as a service"

    Harshawardhan Gadgil Gerrit Code Review
    Harshawardhan Gadgil authored and Gerrit Code Review committed May 21, 2012
  4. mkae nuke_service.rb path to be correct.

    Chunjie
    Chunjie committed May 21, 2012
    Change-Id: Id1afeaa36ec58b7451506f8d70e023d77e2c9b2d
Commits on May 20, 2012
  1. add vblob service support for dev_setup

    figo
    figo committed May 20, 2012
    Conflicts:
    
    	dev_setup/cookbooks/cloud_controller/attributes/default.rb
    	dev_setup/lib/job_manager.rb
    
    Change-Id: I10bb973e4af3e6d7c7124e834c1ead53256c079e
Commits on May 19, 2012
  1. Merge branch 'master' into services-r12

    figo
    figo committed May 19, 2012
    Change-Id: Iab5c37d64ef09777020432f4859924a4a108444b
Commits on May 18, 2012
  1. update uaa with fix for web authorization approval UI, and tests for …

    daleolds committed May 17, 2012
    …the fix
    
    update secoauth, fix uaa devsetup
    
    Change-Id: I9d568830fddcd88701cbe507bca3cbb04174000c
  2. Merge "[README] Update legacy env var"

    d authored and Gerrit Code Review committed May 18, 2012
  3. sanitize varz

    figo
    figo committed May 18, 2012
    Change-Id: I3d4aec3652a51f96196f28035bdd881ada5ff51e
  4. [README] Update legacy env var

    d committed Apr 7, 2012
      Reference VCAP_APP_{HOST,PORT} instead of the legacy VMC_* vars
    
    Change-Id: I8733e41fb3e8db7c74bf6fd1cc962cb87d0a0f7e
  5. Merge branch 'services-r11'

    kushmerick committed May 18, 2012
    - 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 17, 2012
  1. [dev_setup] enable postgresql service

    Frank Lu
    Frank Lu committed May 15, 2012
      1. postgresql_node, ccdb, aaudb, acmdb will use the same postgresql and the same user/password (should be superuser).
      2. postgresql_node's long time killer will absolve the activities in ccdb/aaudb/acmdb for they use the same super user/password
    
    Change-Id: I522a8d8f90d0907827e9ee2db0d6ce429d02b1ec
  2. Change URL to Lucid

    d committed May 17, 2012
      Point the download URL of Ubuntu to the page for 10.04
    
    Change-Id: I2e63a4dcf01a5f5e46af77fe18230b282e060e0b
  3. Merge "Deploy the UAA in dev setup exactly like we would in bosh."

    Dale Olds Gerrit Code Review
    Dale Olds authored and Gerrit Code Review committed May 17, 2012
Commits on May 16, 2012
  1. Merge "Java and Spring fixes for javaee namespace and use of Annotati…

    trisberg authored and Gerrit Code Review committed May 16, 2012
    …onConfigWebApplicationContext"
  2. Deploy the UAA in dev setup exactly like we would in bosh.

    joeldsa committed May 8, 2012
    Change-Id: I393c3787dc0bb051ce0071e03e08a01a48bce5b5
Commits on May 15, 2012
  1. Merge "CF-29: add vcap_components from command line if present"

    dsyer authored and Gerrit Code Review committed May 15, 2012
  2. Dev setup support for memcached as a service

    Harshawardhan Gadgil
    Harshawardhan Gadgil committed May 10, 2012
    - Configure sasldb and lib event when going dev setup for memcached
    - Addressed CR comments
    - Updated vcap to remove couchdb from optional services, this change will be made later
    - Cleaned up memcache dev setup recipie (in place edit of saslauthd config file)
    - Configured neo4j and memcached to be excluded by default, use environment variable to override
    - Config files corrections from CR comments
    - Deleted unused file, added default 16M memory for memcached instance
    
    Change-Id: I3f28d4b42989af6dc56ca1757daff93b43b5f6d7
Commits on May 14, 2012
  1. Merge changes I0a087b84,If5b7924f

    anfernee authored and Gerrit Code Review committed May 14, 2012
    * changes:
      [router] Use pidfile utils in vcap_common. Disable thin's signal to avoid swallowing signals.
      [router] Remove legacy statistics collecting code
  2. [dev_setup] Group should be an integer

    d committed May 14, 2012
      Newer versions of Chef varies its behavior based on the type of GID.
    This patch (kudos to Doug MacEachern) makes both new and old versions
    happy.
    
    Change-Id: Ib7f05899d2e2e04ca34385512efcad8509d9cc5d
  3. Merge "bump logging gem and point to git repo with a SHA ref"

    bnugmanov authored and Gerrit Code Review committed May 14, 2012
  4. Java and Spring fixes for javaee namespace and use of AnnotationConfi…

    trisberg committed Apr 10, 2012
    …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
  5. Merge "Bump tests submodule pointer"

    Jennifer Hickey Gerrit Code Review
    Jennifer Hickey authored and Gerrit Code Review committed May 14, 2012
  6. [router] Use pidfile utils in vcap_common. Disable thin's signal to a…

    anfernee committed May 14, 2012
    …void swallowing signals.
    
    Test plan:
    
    - BVT passed
    - Unit test passed
    - Check the pidfile in bosh env
    
    Change-Id: I0a087b84146c3e3d3f7ba586c04437c645bcad7a
  7. [router] Remove legacy statistics collecting code

    anfernee committed May 14, 2012
    Test plan:
    
    - BVT passed
    - Unit test passed
    
    Change-Id: If5b7924fe2d64933b7100871e5e3a3883a170983