[dev_setup] Update bundler to 1.2.1

Change-Id: Ia487840a9f3b9b25497643c7f00adaed18cefb50
[dev_setup] bump service point

git shortlog 3771022..53d73d2

Andrea Campi (1):
      Update service_broker after changes in vcap-services-base:

Andrew Liu (9):
      bump vcap-service-base gem
      fix advertising message of service broker
      enhance mysql connection pool
      Merge "fix advertising message of service broker"
      enable multiple versions support for mysql_node_ng
      Merge "enable multiple versions support for mysql_node_ng"
      fix mysql provision for without warden mode
      Merge "fix mysql provision for without warden mode"
      multi versions support for postgresql

Chunjie (14):
      add mongodb 2.0 in vcap-services
      Merge "add mongodb 2.0 in vcap-services"
      mongodb proxy in Go
      Merge "mongodb proxy in Go"
      revert db username/password configuration
      bug fix, convert the dbstats into float64
      Merge "revert db username/password configuration"
      Merge "bug fix, convert the dbstats into float64"
      bring ring buffer to avoid extra memory copy operations
      Ship the data between proxy and mongo server on the UnixSocket
      change the ring buffer writer side
      Merge "bring ring buffer to avoid extra memory copy operations"
      Merge "Ship the data between proxy and mongo server on the UnixSocket"
      Merge "change the ring buffer writer side"

Cliff Wang (25):
      Merge remote branch 'origin/services-r9' into warden
      Move mongodb to warden
      enforce loop-device style mongodb quota
      Fix some errors introduced by auto merge
      Add integrity check in case mongod doesn't be shutdown properly;     Add mongodb to warden migtration procedure;
      Merge "Add integrity check in case mongod doesn't be shutdown properly; Add mongodb to warden migtration procedure;" into warden
      MongoDB unit test refactor
      warden base gem
      Merge remote branch 'master' into 'warden'
      mongodb in warden serialization enabled
      warden base: 1. Add 'iptables' command retry
                   2. Replace class variables with class instance variables
                   3. Add log folder checking in case "bosh recreate" delete log folder
                   4. Enlong files copy timeout when doing migration to loop file per vblob
       	           5. Refactor logger
      Merge "warden base: 1. Add 'iptables' command retry
                          2. Replace class variables with class instance variables
                          3. Add log folder checking in case "bosh recreate" delete log folder
                          4. Enlong files copy timeout when doing migration to loop file per vblob
                          5. Refactor logger" into warden
      Merge "mongodb in warden serialization enabled" into warden
      update base
      add switch disabling loop file quota
      Merge remote branch 'master' into 'warden'
      Update base ref
      Fix mongodb repair bug which making data file explode 4 times of its original size
      Fix repair path hardcode & a log message bug
      Merge commit 'master' into 'warden'
      Bump base reference to new warden protocol
      Instroduce multi-version to warden branch
      Using async warden stop interface to accelerate shutdown process
      Merge remote branch 'master' into 'warden'
      Bump warden refs

Eagle Chen (7):
      Wardenize mysql
      Restore privileges after dropping all tables in mysql
      Read correct mysql memory parameters
      Merge "Read correct mysql memory parameters"
      Correct usage of mysql connection pool
      Merge "Correct usage of mysql connection pool"
      Add max_disk and correct quota enforcer

Figo Feng (1):
      support restore mysql service if missing instance dir

Frank Lu (7):
      move wardenized services under ng
      Merge branch 'warden'
      Thorough cleanup after a fail provision
      Merge "Thorough cleanup after a fail provision"
      support to evict os page cache of image files for wardenized postgresql service
      Merge "support to evict os page cache of image files for wardenized postgresql service"
      remove db_size_overhead from postgresql ng service

Harshawardhan Gadgil (29):
      Wardenize memcached
      Merge "Wardenize memcached" into warden
      Initial commit for marketplace code
      Marketplace Gateway updates
      Periodically poll marketplace catalog
      Add supported version and version aliases in CC advertise request
      Minor cleanup
      Register with router to allow multiple gateways for load balancing
      Handle marketplace removes an existing version of existing service
      Add support for varz/healthz to marketplace gateway
      Marketplace Updates
      Sample config changes
      Marketplace Updates - 2
      Appdirect default mappings should be hash and not array
      Add unit tests for marketplace base code
      Merge "Add unit tests for marketplace base code"
      Update base gem pointer to include provisioner check
      Refactor Marketplace Gateway and Appdirect code
      Add oauth support for appdirect requests
      Prepare memcached warden fs using size = 1
      Merge "Prepare memcached warden fs using size = 1"
      Refactor CC interaction code
      Multiple version support for Redis
      Use provisioned service details for redis instance dump/import
      Merge "Multiple version support for Redis"
      Merge "Use provisioned service details for redis instance dump/import"
      Do not set unsupported settings in redis.conf for redis 2.6+
      MPGW: Set acls only if they are specified
      Merge "MPGW: Set acls only if they are specified"

Henry-CF (1):
      remove unused options arguments     Signed-off-by: Henry-CF <hchen@rbcon.com>

Nicholas Kushmerick (4):
      Merge "Wardenize mysql" into warden
      Update base gem pointer for legacy services
      allow non-free mongo & memcache plans; fix memcache startup
      Merge changes I66390da8,I1350fb76

Tang Rui (27):
      Merge branch services-r11 into warden by squash
      Move redis to warden
      1. Grandfather existing instances that are too large;
      2. Disable virtual memory settings;
      3. Not mount migration directory since warden doesn't use it.
      1. Support snapshot and serialization API on warden;
      2. Fix some bugs introduced by the merge from master and the new base.
      Move rabbitmq to warden
      Merge "Move rabbitmq to warden" into warden
      Add starting timeout configuration for unit test
      Fix two bugs for redis and rabbitmq unit tests
      Use base utility function to handle port and check instance start status
      Rename max_db_size to max_disk and some small enhancements
      Merge branch 'master' into warden
      Use multi-threads to stop instances
      Update base reference to fix duplicated run instance bug
      Return true when shutdown finishes
      Return true when rabbitmq node shutdown finishes
      Merge "Return true when rabbitmq node shutdown finishes" into warden
      Merge branch 'master' into warden
      Add memory limitation calculation
      Merge "Add memory limitation calculation"
      Move warden common options parsing to base
      Fix snapshot bug that use wrong redis-server binary path in rollback
      Remove deprecated max_swap from ng redis
      Fix redis unit test bug introduced by multi-versions support
      Refine instance start/stop functions
      Merge "Refine instance start/stop functions"
      Fix postgresql provision for without warden mode
      Merge "Fix postgresql provision for without warden mode"

Yang Yang (19):
      move vblob into warden
      Merge "move vblob into warden" into warden
      remove vblob from loop device; add unit test cases on exceptions
      add include info to let vblob find proper error code
      fix some minor bugs for vblob
      let vblob raise proper exception on unprovision
      fix a bug in vblob migration unit test; avoid hard-codes in some unit-test
      Merge "fix a bug in vblob migration unit test; avoid hard-codes in some unit-test" into warden
      bump base pointer
      fork a process to remove vblob directory; fix some minor bugs in unit test
      Merge "fork a process to remove vblob directory; fix some minor bugs in unit test"
      make vblob quota configurable
      make vblob service dir configurable
      Merge "make vblob service dir configurable"
      pending thread safe case for postgres in ci environment
      modify mysql unit test cases for ci enviroment
      Merge "modify mysql unit test cases for ci enviroment"
      remove pending ci cases in mysql because of the speed up in mysql     server connections
      Merge "remove pending ci cases in mysql because of the speed up in mysql server connections"

andyzh (11):
      initialize bandwidth proxy
      Merge "initialize bandwidth proxy"
      correct the max clients formular
      correct the max_clients calculation
      integrate proxy to rabbit node
      update vm_memory_high_watermark config
      deprecate max_memory for rabbit
      Merge "deprecate max_memory for rabbit"
      better code stype for rabbitmq_timeout
      implement bandwidth per second
      support multiple version for rabbitmq

felixhoo (1):
      Launch service in warden by warden_service_ctl

stefan.schneider (3):
      pass the service_start_timeout config entry to mongodb start retires
      Merge "pass the service_start_timeout config entry to mongodb start retires"
      fix recovery for rabbitmq. added a dummy restore method.

Change-Id: I917a8025a07b39fecbc7938f73c5f10c955d1a79
[dev_setup] bump points for cc/stager/dea

****** cc short log ******

Dr Nic Williams (1):
      Bump em-hiredis/hiredis

Jennifer Hickey (1):
      Add back example cc config file

Jesse Zhang (1):
      Merge "Add back example cc config file"

Joel D'sa (6):
      Upgrade the CC to use the latest uaa gem
      Merge "Upgrade the CC to use the latest uaa gem"
      Fixed a couple of log messages
      Fix the use of deprecated api
      Fixed the method call to create a user in the UAA
      Merge "Fixed the method call to create a user in the UAA"

Pieter Noordhuis (2):
      Make /info/services accessible to everybody
      Don't subscribe when number of messages to receive is 0

****** dea short log ******

Anfernee Gui (1):
      DEA generates private id for running instance

Dr Nic Williams (4):
      dea.yml intervals key now completely optional
      fix spelling of 'debugger'
      dea.yml logging.level defaults to 'debug'
      Log the DEA's uuid when it registers itself

****** stager short log ******

Dr Nic Williams (1):
      Support generic env without -u flags to unset vars

Change-Id: Ia88f1b91550f6946ba748303b1d1697475b61b7f
Dev-setup for multiple redis version

Conflicts:

	dev_setup/cookbooks/redis/templates/default/redis_node.yml.erb
	dev_setup/cookbooks/redis/templates/default/redis_worker.yml.erb

Change-Id: I19d2769271c7d656acfbc0ddb13f5935a53f2b98
remove service filesystem from default list

Change-Id: I94023e512f1c6c35359156f273d776b0cf7baaca
Merge "Dev-setup for multiple redis version"
[dev_setup] apply the upload patch for nginx

Change-Id: I5085c74deb564062911324a68f275631cd0be830
[bugfix] apps can't get staging log

The root cause is that vcap_redis can't start since multiple redis
version supported in the previous change.

Change-Id: I9492a742d09d2305bb7554b2f10d48805547238f
increase cc nginx timeout value to avoid 504 error

There are always serveral random cases fail in ngihtly build by
504 error.

The root cause is timeout in cc nginx, not router nginx, increase
the value from 30 to 90.

Change-Id: I3259b2eb501989767ffc07a9e62ed9e2dd1afddb
redis attributes should be loaded before cc

Nightly build below is broken.
http://ci.cloudfoundry.org/view/QA/job/QA_BVT_Serial/352/

The root cause is the sequence to load cookbook attributes is
random in chef, and now cc depends on redis.

So, explicit specify redis attributes to be loaded before cc.

Change-Id: I3cb9afd1ce4dec8c342a30b6c2ac3c809dfeea9f
change tests submodule from old BVT to vcap-yeti

Change-Id: I34fcc891f1d2133323fec7429e44df460137af73
Signed-off-by: chuny <chuny@chuny.(none)>
[dev_setup] support java7 runtime

Change-Id: I5f3bfb873f8d1aa335c097a58cf9f3f3b5598610
support rabbit for multi version

Change-Id: I47142f92c6b4d51c433fdd7ba9bbf761d2e7b9fe
remove the cc cookbook's dependency on redis

When deploying a node just containing cc, redis cookbook will also
be deployed, but many things in redis cookbook are useless for cc

So, cc cookbook should not depend on redis cookbook

Change-Id: I4118b90e8da93a4781c1c70055a0ddd7d0983125
Bump stager for assets precompilation

- Add node runtime to ruby path for JavaScript compilation

stager shortlog 206b107..e39a094
Jennifer Hickey and Matthew Kocher (1):
  Bump vcap-staging

Maria Shaldybina (1):
  Assets precompilation for rails3 and fixes

Pieter Noordhuis (1):
  Bump vcap-staging

Change-Id: I5610c7364c10fc96fbf13a97ab2dd5624838b203
add service timeout for echo gateway

Change-Id: I97d16d8a8ab31034a0a48a38051f58e95a2e9eb6
Merge "Bump stager for assets precompilation"
Upgrade chef to avoid break by moneta 0.7.1

Moneta was upgraded from 0.6 to 0.7, which caused some bug in
chef 10.12.0, this change upgrades chef to latest 10.16.4.

Change-Id: I4f54ae3d1c1e99f48557b5b3a08628027a7d2a85
Merge "[dev_setup] Update bundler to 1.2.1"
keep blobstore client to be 0.4.0

dev-setup was broken by blobstore_client upgrade

Change-Id: Ic6e9cae766c40577e1a44a3be037d4ae0a7db4ab