Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cloudfoundry-attic/vcap
...
head fork: cloudfoundry-attic/vcap
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on May 11, 2012
@d d Merge "[dea] functional tests clean up" fbe6c31
Jennifer Hickey Add Play Framework
Change-Id: I57c11bcc01f4ce128f07678be334aa130d9b0460
16169fa
Jennifer Hickey Merge "Add Play Framework" bfc0e07
Commits on May 12, 2012
Jennifer Hickey Bump tests submodule pointer
Change-Id: If7b7e11198e32fa6b97ba19c926371ddb002aceb
2e48b59
@anfernee anfernee Merge "[dea] Include app_id in router register/unregister message" 60c60f6
mpage [CC] Remove redundant rm
Change-Id: Icba389b9258d737cf5635dca77d02c1256498426
2d1395c
@bnugmanov bnugmanov bump logging gem and point to git repo with a SHA ref
Change-Id: I75260c93f3f6bf977abe937280a1dbf5144d5059
4f0fead
Commits on May 14, 2012
@anfernee anfernee [router] Remove legacy statistics collecting code
Test plan:

- BVT passed
- Unit test passed

Change-Id: If5b7924fe2d64933b7100871e5e3a3883a170983
cc5c6a9
@anfernee anfernee [router] Use pidfile utils in vcap_common. Disable thin's signal to a…
…void swallowing signals.

Test plan:

- BVT passed
- Unit test passed
- Check the pidfile in bosh env

Change-Id: I0a087b84146c3e3d3f7ba586c04437c645bcad7a
748a3ee
Jennifer Hickey Merge "Bump tests submodule pointer" 0766153
Thomas Risberg Java and Spring fixes for javaee namespace and use of AnnotationConfi…
…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
ddb8f52
@bnugmanov bnugmanov Merge "bump logging gem and point to git repo with a SHA ref" f01313f
@d d [dev_setup] Group should be an integer
  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
4fc210c
@anfernee anfernee Merge changes I0a087b84,If5b7924f
* changes:
  [router] Use pidfile utils in vcap_common. Disable thin's signal to avoid swallowing signals.
  [router] Remove legacy statistics collecting code
0c46aef
Commits on May 15, 2012
Harshawardhan Gadgil Dev setup support for memcached as a service
- 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
b00249e
@dsyer dsyer Merge "CF-29: add vcap_components from command line if present" 97b6af1
Commits on May 16, 2012
@joeldsa joeldsa Deploy the UAA in dev setup exactly like we would in bosh.
Change-Id: I393c3787dc0bb051ce0071e03e08a01a48bce5b5
d0fd9bb
Thomas Risberg Merge "Java and Spring fixes for javaee namespace and use of Annotati…
…onConfigWebApplicationContext"
288c628
Commits on May 17, 2012
Dale Olds Merge "Deploy the UAA in dev setup exactly like we would in bosh." bb84976
@d d Change URL to Lucid
  Point the download URL of Ubuntu to the page for 10.04

Change-Id: I2e63a4dcf01a5f5e46af77fe18230b282e060e0b
dee93e6
Frank Lu [dev_setup] enable postgresql service
  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
4b03538
Commits on May 18, 2012
@kushmerick kushmerick Merge branch 'services-r11'
- 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
be6ee51
@d d [README] Update legacy env var
  Reference VCAP_APP_{HOST,PORT} instead of the legacy VMC_* vars

Change-Id: I8733e41fb3e8db7c74bf6fd1cc962cb87d0a0f7e
246304a
figo sanitize varz
Change-Id: I3d4aec3652a51f96196f28035bdd881ada5ff51e
b404b63
@d d Merge "[README] Update legacy env var" 8cd5856
@daleolds daleolds update uaa with fix for web authorization approval UI, and tests for …
…the fix

update secoauth, fix uaa devsetup

Change-Id: I9d568830fddcd88701cbe507bca3cbb04174000c
6f4acf0
Commits on May 19, 2012
figo Merge branch 'master' into services-r12
Change-Id: Iab5c37d64ef09777020432f4859924a4a108444b
60ef7a9
Commits on May 20, 2012
figo add vblob service support for dev_setup
Conflicts:

	dev_setup/cookbooks/cloud_controller/attributes/default.rb
	dev_setup/lib/job_manager.rb

Change-Id: I10bb973e4af3e6d7c7124e834c1ead53256c079e
047dd6c
Commits on May 21, 2012
Chunjie mkae nuke_service.rb path to be correct.
Change-Id: Id1afeaa36ec58b7451506f8d70e023d77e2c9b2d
a7be863
Harshawardhan Gadgil Merge "Dev setup support for memcached as a service" b31c1af
@d d [dev_setup] Fix Chef regression
  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
2abb03a
@d d [stager] Add license and notice to stager
  This change adds a license and notice file to the stager sub dir in
preparation for giving it its own repo.

Change-Id: I7fbdd2895b4d556f9439ae900b461ad7955ab798
43479e9
@d d [dev_setup] set owner of mongo tarball
  Correcting my stupidity of commenting out the ownership and permission
attributes in commit 2abb03a.

Change-Id: I7ddc6b070cb167d3285ece9aba3390a837fe4114
bdca700
@d d [dev_setup] Use github for lua-cjson source
  This change switches to downloading the source from github to avoid
outage of lua-cjson's author's homepage.

  Test plan:
    Run dev_setup on a vanilla VM and pass BVTs

Change-Id: I8068a5060014b46847cfa288916e282de22fb88a
0f4be48
Commits on May 22, 2012
Haipeng Wu Add an api for CC, which returns a specific service offering
Get /services/v1/offerings/:label

Change-Id: I47e66278d0782e095b553cafbc904591e25b5571
af46278
Chunjie Merge "mkae nuke_service.rb path to be correct." 8a0d0c6
Haipeng Wu Merge "Add an api for CC, which returns a specific service offering G…
…et /services/v1/offerings/:label"
d25c24f
@felixhoo felixhoo Merge branch 'master' into services-r12
Conflicts:
	dev_setup/cookbooks/cloud_controller/attributes/default.rb
	dev_setup/lib/job_manager.rb

Change-Id: I3bcecd9b7d86472c58efdbd779076391c4b0c781
b1b6afd
Harshawardhan Gadgil Install libevent locally to have memcached config dependency fulfilled
Change-Id: Ie133e24fc6588285b46fb3dd199e72652b998049
1ac418e
Harshawardhan Gadgil [devsetup] memcached statically linked to libevent, disable sasl
Change-Id: Idb8bfd06276c19f69c3fa7b5f44d9fea5196adce
651f270
@d d Merge changes I8068a506,I7ddc6b07
* changes:
  [dev_setup] Use github for lua-cjson source
  [dev_setup] set owner of mongo tarball
d51e003
@schinen schinen [dev_setup] Fix memcached service chef cookbook.
- change libevent source url (cf_remote_file does not support download from https and redirect yet).
- add checksums (for cf_remote_file).
- use dev_setup cache.

Change-Id: I3ef634af15d99d44e12287427f8e4dbaf8153509
2d4db88
Commits on May 23, 2012
@felixhoo felixhoo Add cf_plan_id in service api & ccdb
Change-Id: I79538afb50f629718c780f8c3a61d39bb263fd5b
30d4ba1
Chunjie support multi service_broker
Change-Id: Idac221b43011b1602606c6fe01e7f5249ce328b9
2c5da55
Harshawardhan Gadgil Updated readme explaining exclusion of components on dev setup
 - Modified vcap binary to show summary of exclusion and point to documentation
Change-Id: Iee8d5defe6021f2eb5bfcb43de46724731574194
8e6f144
@schinen schinen Merge "[dev_setup] Fix memcached service chef cookbook." a14baf8
Commits on May 24, 2012
@felixhoo felixhoo Add FSS support for dev_setup
Change-Id: Iac1e4ae2deb8ea880ff9671a8e495a51ddc0fdcd
178ff44
@felixhoo felixhoo Bump vcap_common to include mongolab gateway fix
Change-Id: I955671269b23a6c33165a121ac51300870322495
5be108e
@d d [router][staging] Add license
  In preparation of splitting out router and vcap_staging gem

Change-Id: I360d0c6040c003ed611b89072ff235b388cb7879
75863fd
Jennifer Hickey Allow any whitespace between 'require' and 'sinatra'
in main Sinatra app file

Change-Id: I430575cde67eb30db059b0ece554434ee01d246f
cc89d6b
@d d [CC][HM] Remove vendor cache
  Test plan: create a release and pass BVTs

Change-Id: I80b997859c8366fd379dc00fd2fa097aebe91623
79ab798
Commits on May 25, 2012
Jennifer Hickey Merge "Allow any whitespace between 'require' and 'sinatra' in main S…
…inatra app file"
1b33208
Commits on May 28, 2012
Frank Lu [dev_setup] postgresql service could use standalone postgresql
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
5538a5d
@anfernee anfernee [HM] Fix Gemfile for missing nats
Change-Id: Icb07e0fe8e51699b9cb435c2c12831baac13d968
f7f7354
Commits on May 29, 2012
@kushmerick kushmerick Merge changes I95567126,I79538afb into services-r12
* changes:
  Bump vcap_common to include mongolab gateway fix
  Add cf_plan_id in service api & ccdb
c3dce2b
Commits on May 31, 2012
@kushmerick kushmerick Disable dev_setup installation of Neo4j
Change-Id: I78b7c99a7ef0e27b4f7884ddaca2850ab9011027
fb08ff5
Commits on Jun 01, 2012
@anfernee anfernee [dev_setup] Fix mongodb on i686
Change-Id: If7772bdee7959e24253cb9e1ac80ccec76b2d34d
1ed8440
Commits on Jun 02, 2012
Harshawardhan Gadgil Dev-setup changes for updating mongodb from v1.8.1 to v1.8.5
Change-Id: I60caf1c6d9f16dd2bd06ce77ff9397f864298a6d
27df035
@benmccann benmccann Add missing character
Change-Id: I6451d46d25ebc1790e1ce3d0271dcf39899dea87
5ea9b56
Commits on Jun 04, 2012
@d d Merge "Remove unnecessary depedencies on cookbooks we don't have or n…
…eed."
ef32240
Commits on Jun 05, 2012
@daleolds daleolds bump test submodule pointer.
Change-Id: Iad4be6089e14c9f023e2a3d0f9321f3458be3b3c
ee2b98d
@joeldsa joeldsa Removed the email filter so that every user will now
get a UAA token

Change-Id: Icae09aa2e26cc70c0cb406b6c4a033ab7322bd46
671fe78
@joeldsa joeldsa Updated the access token validity for vmc
to a week to retain existing user token expiration policy.

Updated the access token validity for cloud_controller
to a week as well so that it does not need to frequently
refresh it's access token.

Change-Id: Ic8147ad4ee9d28ddd898f103bdf959507b5e6522
bef1d3b
@joeldsa joeldsa Bump the submodule pointer to tests.
Change-Id: I565a822f35b3c1d69f403d1458eacba84dfe491c
4ffcc95
Commits on Jun 06, 2012
Haipeng Wu [dev_setup] make nginx avoid repeated download
This makes dev_setup take less time.

Change-Id: I85be599b2d32fec390437c6f9a5e0e7bc5dcec58
56d5cef
@schinen schinen Cache MongoDB tarball.
- use dev_setup cache.

Change-Id: I4fcd9cacc31428e52e506f106a836972374daa4a
829edba
@schinen schinen Cache NodeJS and other tarballs.
- use cf_remote_file.
- add checksums (for cf_remote_file).
- use dev_setup cache.

Change-Id: I1abf6890442e0bf494531439b5d7cc83352e5b92
169290c
Commits on Jun 07, 2012
@schinen schinen Merge "Cache NodeJS and other tarballs." 68599ff
@andl andl Merge remote branch 'origin/services-r12'
Conflicts:
	cloud_controller/Gemfile
	cloud_controller/Gemfile.lock
	dev_setup/lib/job_manager.rb

Change-Id: I547a35d326314238f03fdc61a4a680a9517dce12
7971742
Commits on Jun 10, 2012
@kushmerick kushmerick Bump vcap/services to Services-R12
Change-Id: I3001f59a999488cba8f338947eb097f88deea37a
1e3df2a
Commits on Jun 12, 2012
Haipeng Wu Merge "[dev_setup] make nginx avoid repeated download" 69eca88
@benmccann benmccann Allow vcap to be installed on Ubuntu 12.04
Change-Id: I6e5c23879a618016f93c0bffd492ae7f531505e2
a519ef2
@EagleChen EagleChen update mysql template for dev_setup
Change-Id: I2c35747ff6596f3aaca97cfe018af926ba38bf4d
48f7518
Commits on Jun 14, 2012
@kushmerick kushmerick Merge "Dev-setup changes for updating mongodb from v1.8.1 to v1.8.5" 7524e0d
Harshawardhan Gadgil Do not install excluded components to save dev setup time
Change-Id: I0b5170307b7715f011b8163dc97a0fc9d262a4ca
e71c34c
Frank Lu [dev_setup] install python-software-properties package before install…
…ing postgresql

Change-Id: Ife3d630f4d862d7f899cee95cf0d3f33b40bd550
a49395e
Commits on Jun 15, 2012
@dsyer dsyer CF-43, CF-48: fix location of neo4j hosting extension
Change-Id: Icc081015e90e57b4e6ef804c46cc2859808dc146
a67ab57
Commits on Jun 17, 2012
@figof figof Merge "update mysql template for dev_setup" 65b7552
Commits on Jun 18, 2012
@dsyer dsyer Merge "CF-43, CF-48: fix location of neo4j hosting extension" 1ef1f81
Commits on Jun 19, 2012
Chunjie add service_broker in vcap_dev_setup
Change-Id: Ie0e66d0858edaf4d40a01a8359250655e01ce807
391bcba
Commits on Jun 20, 2012
@anfernee anfernee Revert README. dev_setup is not ready for ubuntu 12.04.
Change-Id: I2b7aa4faeb49b9671f62e67080c83af75a47c180
be3df26
figof [dev_setup]update ref from vcap/bin/services to real bin
Conflicts:

	dev_setup/bin/vcap

Change-Id: I9e5280c682fec5e02f6a1a475a658d6b730ebc33
0f7fd61
@frhwang frhwang Add Elasticsearch as a Service support
Patch set 1
- based on Neo4j's dev_setup
- install Elasticsearch (http://www.elasticsearch.org)
- install elasticsearch-http-basic plugin (https://github.com/Asquera/elasticsearch-http-basic)

Patch set 2
- Rewrite dev_setup based on recipe of MongoDB
- Add executable of elasticsearch service
- Modify service version & description in config template
- Delete allow_over_provisioning option in config template
- Add elasticsearch to service list in job_manager
- Modify description in role json file

Patch set 3
- Fix incorrect service executable name
- Add elasticsearch to:
-- built-in services in Chef attributes of CC
-- DEFAULT_CLOUD_FOUNDRY_EXCLUDED_COMPONENT in dev_setup/bin/vcap
-- INSTALL_JOB_PROPERTIES in job_manager

Patch set 4
- Resolve change conflict
- Add myself to the AUTHORS list

Change-Id: Id232c9d414cd33db8b065969b665ac04c54b4d3f
2106ced
@anfernee anfernee Merge "Revert README. dev_setup is not ready for ubuntu 12.04." 4fa5dca
figof remove services pointers
Change-Id: Id76f26a52253f1d4535f394aadd1880c70fd9304
01c9377
Frank Lu [dev_setup] check whether the postgresql is installed and config file…
… exists

Change-Id: I04664e925c8dd56c0e668daebe7a884274c2e013
8b4e881
Harshawardhan Gadgil Dev setup for CouchDB
Change-Id: Id5e4de4228f2df690cbc3d3cc6f6f141704b0727
acead0e
Commits on Jun 21, 2012
@cliffwang cliffwang mongo should describe itself as 'document'
Change-Id: I50be0c0a7ab52e224c7bdf05c5c39da869211fcc
bb7c711
Frank Lu [dev_setup] support service backup and backup_manager
  backup/backup_manager is disabled by default
  support local filesystem to store backups

Change-Id: I918570b494a6b688e0eea713b73cd5ba34a5f0ca
d564e8c
@schinen schinen Remove 'builtin_services' properties.
'builtin_services' property is not needed to be listed as required installed job properties.
this properties is only used from the cloud_controller cookbooks when dev_setup install cloud_controller.

Change-Id: Ia9b544bb7074b95491f1f23e81a405a8bd85d6ad
7ca2da9
Frank Lu [dev_setup] fix the location of backup_manager
  vcap/bin/services has been removed, should use that in vcap/services/tools/backup/manager/bin

Change-Id: Icbc4bdefdfaafd4dce97858e7cef276e115478b2
2d35116
Thomas Risberg Adding Java 7 support
 - modifying chef scripts to support new Java 7 runtime

 - adding Java 7 as runtime for standalone apps

 - adding Java 7 as runtime for jvm based web frameworks

 - bumping submodule pointer for tests

Change-Id: I33c74cab9d4f530a80dd941d77ce986435a04cad
b02eca8
Commits on Jun 22, 2012
Thomas Risberg Merge "Adding Java 7 support" 592557c
@frhwang frhwang Add elasticsearch service to vcap core components list
Change-Id: I99d8717b79d30b0de3cd3419f541568228a16458
5be1574
Frank Lu Merge "[dev_setup] fix the location of backup_manager" 288382e
Harshawardhan Gadgil Merge "Do not install excluded components to save dev setup time" 5b8a352
Harshawardhan Gadgil Corrected const
Change-Id: I21398ced562206d048ec231318fe08d0255f7cbd
decf636
Harshawardhan Gadgil Merge branch 'master' into sversions
Change-Id: I84717e7d2045be23eb90609aedee6b0139eb0cb4
9beef1b
Commits on Jun 25, 2012
Haipeng Wu [dev_setup] Replace public web links with cf blobs
Dev_setup needs to download tarballs from public web site, this
leads to setup failure when one of those public sites is broken.

This change list makes dev_setup download tarballs from cf blobs,
dev_setup will be much more stable.

Change-Id: I42ce1cc96d7946fc3606986c2bf27e2a38a6ec69
13f9dbc
Commits on Jun 26, 2012
Frank Lu [dev_setup] refactor vcap components
Change-Id: Ia423958c2bf69f883c4107071193345c23c0b48d
5f87720
Commits on Jun 27, 2012
figof bump services for dev_setup
Change-Id: I6caddbd37e94f80b652c602a9fa56a859d0b3c43
00b82d7
@figof figof Merge "[dev_setup] check whether the postgresql is installed and conf…
…ig file exists"
1d02dcb
@figof figof Merge "[dev_setup] refactor vcap components" fbb920a
Haipeng Wu [dev_setup] Roll redis back to 2.2.15
Change-Id: I8dc1c3e9b2a94c05c1463a9f6c943744ee358cfe
469e9e0
Haipeng Wu [dev_setup] Move elasticsearch into cf blob
Change-Id: I4a40f8b885ddf6c84937123fea93a53de11bb6ab
7936db7
@cliffwang cliffwang Merge "mongo should describe itself as 'document'" fdc19d8
Commits on Jun 28, 2012
figof Merge "bump services for dev_setup" 393136f
Commits on Jun 29, 2012
@SlimYang SlimYang fix a bug in couchdb downloading in dev_setup
Change-Id: I24f26922ade97d70a72691649b1631ee3b23a109
89e48f7
@SlimYang SlimYang Merge "fix a bug in couchdb downloading in dev_setup" 4a316b3
Haipeng Wu Merge "[dev_setup] Roll redis back to 2.2.15" 0157516
Haipeng Wu [dev_setup] Move couchdb into cf blob
Change-Id: I46811836302b092ba6ad5b608fe56fd3392713e7
70deccc
@mariash mariash ImageMagick/RMagick support
Change-Id: I78e74742705e2c37b6439d5422518b8b487b158c
e835eed
@mariash mariash Bump tests pointer for ImageMagick
Change-Id: I11d88175b613372f0c12e9e2526e2044bd56adba
4b24ed3
Commits on Jun 30, 2012
Frank Lu [dev_setup] Support service lifecycyle (snapshot/serialization)
  1. only support local file system to store snapshots
  2. by default, this feature is disabled

Change-Id: Ieb72f43dea9558b266c4a783d928a6957fccd52c
349a73c
Frank Lu [dev_setup] generated vcap_service_backup_ctl should be in git ignore…
… list

Change-Id: I64b44e91418249efac54a1f593cf02546393db61
651a251
Commits on Jul 02, 2012
Haipeng Wu Merge "[dev_setup] Move couchdb into cf blob" 6fc288e
@kushmerick kushmerick Merge "Add elasticsearch service to vcap core components list" 0670d71
Harshawardhan Gadgil Devsetup to support multiple versions of mongodb (1.8.5 and 2.0.6)
 - Add supported versions and version aliases to gateway config

Change-Id: Ife62b048cb8df98f79d705afc853a7b18a4f1e58
84fc86f
Commits on Jul 03, 2012
Haipeng Wu Merge "[dev_setup] Move elasticsearch into cf blob" da0e573
@schinen schinen Add timeout attributes to service cookbooks.
Change-Id: I4e4a491ca22031cbe7a799b5e095c4806165bf07
3f4ecb0
Haipeng Wu [dev_setup] Fix a bug while starting dev_setup
Redis/mysql/mongodb/postgre gateway can't connect to redis-server
while starting dev_setup.

To fix it, make service lifecycle disabled by default.

Change-Id: I61b40cbe425d19e5ecdb4024fc12080078e76813
e45571b
Harshawardhan Gadgil Merge master branch to sversions
 - Dev setup now gets blobs from blobs repo
 - Update mongodb devsetup with blob ids for v2.0.6 mongo blobs

Change-Id: Ie0118d96fc63f9203c7f31822388dd6d8f44ad6b
a7462c3
Commits on Jul 04, 2012
Haipeng Wu Merge "[dev_setup] Fix a bug while starting dev_setup" db7959e
Commits on Jul 05, 2012
@d d [dev_setup] Exit on error
  This change causes dev_setup to exit early on errors instead of
blindly going ahead.

Change-Id: Ia7b74ecc17a986bbce8483476c11666101b4c50e
20d3e5a
@d d [dev_setup][bugfix] Use effective group id
  The following services cookbooks
  - memcached
  - neo4j
  - rabbitmq
  - redis
  currently set certain files and directories to a group of the same
name as the current user, which does not necessarily exist. This change
corrects it to use the effective group id of the current user.

Change-Id: I1fc46f559694043e00ea7dc1b584ebe008539822
0d6ec9a
Commits on Jul 06, 2012
@d d [dev_setup] Work with broken out repos
  This change adapts dev_setup to the repo split.
  - Cookbooks and bootstrapping scripts are updated.
  - bin/{cc,hm,dea,router,vcap} are removed

  Test plan:
  - Run dev_setup on an existing installation, pass BVT's
  - Run dev_setup on a pristine VM, pass BVt's

  Next step:
  - remove the component / gem sub dirs from vcap repo

Change-Id: If24e2e113075cf0d9135d59b594b3a2517c401fa
9bc7403
Commits on Jul 07, 2012
@d d Nuke 2 gems and 7 daemons sub dirs
  The following gems are removed:
  - vcap_common
  - vcap_staging
  The following core components are removed:
  - cc
  - hm
  - dea
  - router
  - stager
  - warden, warden-client, em-warden-client
  - package_cache, package_cache_client

  Test plan:
  - BOSH deploy, pass BVTs (so cf-release no longer depends on bits
    under src/core/{dea,router,...}
  - dev_setup succeeded, BVTs passed

Change-Id: I99a23e0cfb3019c39aa4f40da3f566c0a6ca459e
23a53da
Commits on Jul 09, 2012
Harshawardhan Gadgil Start mongo 2.0 with journalling disabled
Change-Id: Ib3a95dedcdf1996febbc360a8d49b7c61e8dea89
8e5d34e
Commits on Jul 10, 2012
@mariash mariash [dev_setup] Add node08 runtime with Node.js 0.8.2
Change-Id: I88d702456d246280c4da52fa5ad7c3bc70597ef0
b1cbc4e
Commits on Jul 11, 2012
Haipeng Wu [dev_setup] Install improvement for dev_setup
Now, we can dev_setup successfully, even if the cf instance is
running.

Change-Id: I791a109aeb1c12efca936c74ee5eba6a0072be7c
cc45a79
Commits on Jul 13, 2012
@EagleChen EagleChen [dev_setup] Audit mysql long transactions
Now we can audit mysql long transactions without killing them

Change-Id: I6968646b9039b5f558839528118e748ecd079e66
53125eb
@bluesalt bluesalt Add dev_setup support for installing echo service
Change-Id: I793cd8b5785a2f7ae6df531dad0446b7e6ccaa31
a277b89
Frank Lu Merge "[dev_setup] generated vcap_service_backup_ctl should be in git…
… ignore list"
4e5c430
Commits on Jul 14, 2012
@figof figof Merge "Add dev_setup support for installing echo service" 3c18143
Commits on Jul 15, 2012
@mflu mflu [dev_setup] serialization_data_server should be excluded by default
Change-Id: I81eeb15461f36799d247723250d9c66da4a18a86
2a5022a
figof bump services and tests
bump service broker version from poc to v1

Change-Id: If2785e25967bb1db6dfb0d3811c2fcf8987b43e6
ca8566d
Commits on Jul 16, 2012
figof Merge "bump services and tests" e845c4a
figof include rabbit fix to dev_setup
Change-Id: I64ea84d652808f09039d3cc37f26ee3faef1a91b
8d15d21
Jennifer Hickey Allow user to override RAILS_ENV and RACK_ENV
- Remove defaults in favor of configuration by
staging plugins

Change-Id: I4c22079e75d2d1c6490af20c13f5b6d6b113dcb9
df5e944
Jennifer Hickey Merge "Allow user to override RAILS_ENV and RACK_ENV" 7799c14
Jennifer Hickey Remove java submodule
Change-Id: Ia0bd61210ba402e559027403c94157f3f0b0c0e0
b490787
Jennifer Hickey Merge "Remove java submodule" 757de5b
Commits on Jul 17, 2012
@EagleChen EagleChen [dev_setup] Reset mysql max_connections property
We won't get "Too many connections" errors in mysql unit tests.

Change-Id: I601fb767833c28622452d0d61bcfaa6002ce97f8
552238b
@bluesalt bluesalt Fixed a bug that occurs when installing echo server.
In some cases such as when source directory and destination are not
located in the same file system, meanwhile a directory with the same
name of source directory existing in the destination, 'mv' will fail.
So use 'cp' instead.

Change-Id: I55bbd820876cfd0d3b9a13f22043168ff85a327f
9100dab
Commits on Jul 18, 2012
Haipeng Wu [dev_setup] Add nginx in front of cc
Change-Id: Ib406823a17ce527f954863e411dae31f32f5d274
e4a3bd7
Commits on Jul 19, 2012
Henry-CF remove unnecessary customization for two gateways
In dev_setup cookbooks, Postgresql gateway and vblobgateway currently are customized to
register themselves as host="127.0.0.1". We could not find any reason to do so
and this adds extra limitation that they only have varz/healthz communication locally.

Now remove this customization to bring two gateways into line with other components.

Signed-off-by: Henry-CF <hchen@rbcon.com>

Change-Id: I78566d34a449e69ea582292c3cacda3de6eab265
4b44c6d
@figof figof Merge "[dev_setup] Audit mysql long transactions" 56ba2bf
Haipeng Wu [dev_setup] Bug fix: uaa can't start in dev_setup
Change-Id: I5ca84301efcda744640af668c9f2d582e74dc23e
2b107a4
Chloe Jackson Update README to include Bug filing info per Deepika
Change-Id: I0056ba9e0318dacb69c9722b1da3a32e98c064e7
dc64c22
Commits on Jul 22, 2012
@figof figof Merge "[dev_setup] Reset mysql max_connections property" d29e28c
Commits on Jul 23, 2012
@figof figof Merge "remove unnecessary customization for two gateways" f9444de
Frank Lu [dev_setup] remove ip_route in postgresql_node.yml
Change-Id: I4a7d03e9ed42989dc58217396a2cdb784d9b2602
57183f6
@SlimYang SlimYang remove ip_route in vblob_node.yml
Change-Id: Ibaa0a311f3ca4c6ad5a344520801a149cf4a01e6
64752d4
@figof figof Merge "remove ip_route in vblob_node.yml" 56edaca
Commits on Jul 24, 2012
Haipeng Wu Merge "[dev_setup] Add nginx in front of cc" 17f321b
@bluesalt bluesalt Fix the bug when dev_setup running in 32-bit boxes
Because currently echo server uses a third party binary file which is
architecture dependent, it will only work in x86_64 platform at the
moment.This patch removes the third party binary and uses bash script
instead to make it architecture indepentdent.

Change-Id: I1477c6cd0ce9ea8f629fbb10900b923051803aac
8b4b17b
Commits on Jul 25, 2012
Haipeng Wu [dev_setup] Make dev_setup use stager process
Change-Id: I9f86494add19fd6b30d13d7cad79e39aadfe830c
81fc151
Commits on Jul 26, 2012
@felixhoo felixhoo Add default plan for dev_setup
Change-Id: I8cafbb02d2c9dd805db5bf51c7e0115b3c457544
c5156d5
Harshawardhan Gadgil Store default exclusion list in a single place
Change-Id: I2637427669af7526a2e03f4405821713cc8d40f7
0f3c8f3
Commits on Jul 27, 2012
Haipeng Wu [dev_setup] fix 504 error running bvt in dev_setup
504 error intermittently occurred when running bvt in dev_setup,
the reason is timeout in http request.
Now we give a longer reponse time to reduce the chance of timeout.

Change-Id: I46be698785169efcfd82b8061c0571a9159945ee
fc429ff
Commits on Jul 30, 2012
@figof figof Merge "Store default exclusion list in a single place" ecacf56
Harshawardhan Gadgil Merge branch 'sversions'
- Bump services git pointer
- Remove dead code

Change-Id: Ie7d0290aa05726c7de0a9e8a292e76389c66c602
1dd0c13
Commits on Jul 31, 2012
Haipeng Wu [dev_setup] delete .rvmrc in dev_setup
The .rvmrc file in vcap will let customers use the wrong ruby
if he manages ruby with rvm.

Change-Id: Id41b00d4b57a36c07e02d741db17a53244cc3c31
921f163
Commits on Aug 01, 2012
Haipeng Wu Merge "[dev_setup] delete .rvmrc in dev_setup" fcd4712
Harshawardhan Gadgil Merge "Merge branch 'sversions'" 02fdec4
Commits on Aug 02, 2012
@SlimYang SlimYang rename 'vblob 1.0' to 'blob 0.51'; fix mongodb versioning issue
$ git shortlog 45380e9..adec879
Tang Rui (1):
      Delete needless enable instance line in rebalance tool

Change-Id: Ib010c94418d742fdb9e510d6a62bcaa72b183fca
0e9ffd0
Commits on Aug 03, 2012
Haipeng Wu [dev_setup] Rename redis components in dev_setup
Change-Id: I8c9a46e370b449163d8a92528d447775026b7bf5
e69d0a8
Chloe Jackson Merge "Update README to include Bug filing info per Deepika" ac38a1b
Commits on Aug 06, 2012
@bluesalt bluesalt Merge "Fix the bug when dev_setup running in 32-bit boxes" 3dc1680
figof bump tests
tests:

$ git shortlog ae3ac03aad87ace09c38ceba90d533b7792aefa7..7a900d83b7f7b836305bcbc283273241db3f48a8
Chloe Jackson (1):
      Update README to include Bug filing info per Deepika

Dave Syer (1):
      CFID-364: use empty scopes for BVT as well

Frank Lu (1):
      multipart uploading the serialized data file

Change-Id: Idecd9c794f670641f9ad4c567de22245009e698f
2fa030a
figof bump services
services:

$ git shortlog adec879..deb5979
Frank Lu (1):
      refactor import_from_data API

Tang Rui (1):
      Use new provision response format

Change-Id: I32d8b45b5b7acf7c27bf2add97ae3d0762826e22
e867e10
Commits on Aug 07, 2012
Haipeng Wu Merge "[dev_setup] Rename redis components in dev_setup" 43fdc8a
@mariash mariash Bump tests pointer
Shortlog for tests bump:

Maria Shaldybina (2):
      Node.js autoconfiguration tests
      Merge "Node.js autoconfiguration tests"

Change-Id: I1494777f54f0135f04121a5854cfb8457c1c1f5c
6c0237b
Commits on Aug 08, 2012
Haipeng Wu replace excluded component with config file
This change list removes the excluded mechanism in dev_setup,
using config file instead, to decide which components shoud
be deployed.

Change-Id: I2eefbf38a2580dc1ee987e1c0cd6e31048a9ed0b
c7496a1
Commits on Aug 09, 2012
Haipeng Wu Merge "replace excluded component with config file" 42530b6
Haipeng Wu create a dedicated blob store for dev_setup
Change-Id: Ie405dd52cb75b2c7b7554a6a3f02d1442ac81a7d
31fd3bb
@mariash mariash Bump tests to git URLs support
tests shortlog c514fcf3..d423ed20

Jennifer Hickey (1):
  Test gem install improvements

Maria Shaldybina (1):
  Test git URLs in Gemfile.lock

Change-Id: I53102fbd4cf7996956db7aec710de9ac4f3f963e
4bf16e2
Frank Lu [dev_setup] refactor import_from_data api for lifecycle feature
Change-Id: Iafe1123d430c3aa343ac9a26081793f8707f0cc1
a4d83fa
Commits on Aug 10, 2012
@anfernee anfernee Include app_id in nginx's access log for dev_setup
Change-Id: I612850ee4aa333dacc4ad5c0256032be9d1454e8
966d188
@kushmerick kushmerick Update Blob service description
Change-Id: I060d9bea3cab565ab92827013ae0f65af67c67bd
7b9e984
Commits on Aug 11, 2012
@figof figof Merge "Include app_id in nginx's access log for dev_setup" 7075ae4
Commits on Aug 14, 2012
@ramnivas ramnivas Update tests to include assets updated to use latest cloudfoundry-run…
…time

assets git shortlog d423ed2..86ce832
Ramnivas Laddad (1):
      Updated assets

Change-Id: I716e40f87040d8ef36eda34f6225deabef88936e
69ebbc6
@ramnivas ramnivas Update tests submodule pointer
tests: git shortlog 86ce8322..d977b91d
Ramnivas Laddad (1):
      When rebuilding maven artifacts, use 'clean'

Change-Id: I765d16d7115e003b87e3ca078535abda56ab4326
a3ebc07
@kushmerick kushmerick Merge "Update Blob service description" 079a552
Commits on Aug 16, 2012
@anfernee anfernee [dev_setup] Fix memory leak in lua code in nginx
Change-Id: Ibba90d64bf606132d2f583eefbd6cc83b3e1e104
83d4fc1
@andl andl [dev_setup] add versions support to all services
1. add supported_versions to service node and gateway
2. add version_aliases to service gateway
3. add default_version to service node

Change-Id: If83e1bf881003c346f51576dfd6f43655057ca76
237eb7a
Commits on Aug 17, 2012
@andl andl Merge "[dev_setup] add versions support to all services" b7f7ce5
Jennifer Hickey Bump tests pointer
git shortlog d977b91..03a6a08f
Jennifer Hickey (1):
      Add tests for DB connections in Rails Console

Change-Id: I6e62cad156989757c6238b1f723f48705699fc1f
91116e9
Commits on Aug 18, 2012
Haipeng Wu [dev_setup] move postgresql into blobstore
postgresql 9.0 can't be installed via apt-get, use dev_setup
blobstore instead.

Change-Id: Ie87066cbf61476de71d871ab8da5d42202294799
f0085b7
Commits on Aug 19, 2012
Haipeng Wu Merge "[dev_setup] move postgresql into blobstore" 18ddec3
Commits on Aug 20, 2012
Haipeng Wu [dev-setup] QA_dev-setup build break fixing
Change-Id: I229b1a68fe30fd3193d6cb1f41cf364fe2142baa
db35e18
@andl andl [dev_setup] remove hard code label in tags field.
Change-Id: I6fa6960c3bfbe0b427114cb2f4f9509bc425a463
277492a
@joeldsa joeldsa Updated the uaa to the latest version.
Also updated the client registration

Change-Id: Ic279af501070d9980d075d2af0a4e3c06d11c050
033c5d9
Commits on Aug 22, 2012
Harshawardhan Gadgil Rename service_broker -> service_proxy in cloud controller's config
 - Update services submodule pointer

Change-Id: Ib5f5747e599d30be2d6097aa2d020dc6956d830d
4a1d657
@kushmerick kushmerick Merge "Rename service_broker -> service_proxy in cloud controller's c…
…onfig"
fd38080
Commits on Aug 24, 2012
Jennifer Hickey Support modular sinatra apps
- Detect and run a single file including
"require sinatra/base", assuming it
makes a call to run!

- Apps with more specialized needs
can package a config.ru and be deployed
as Rack apps

Change-Id: I9ad1b2915df00b116efd7a7f5da44585bfd3472d
c9abdbb
Commits on Aug 31, 2012
Jennifer Hickey Improve process for adding runtimes and frameworks Part 1
- Merge common runtime info into CC
runtimes.yml file

- Remove runtime info from cc config

- Add fully qualified path to Java 6 for
better co-existence with Java 7

- Remove unused app_servers and stager_services
fields from staging manifests

- Temporarily copy old staging manifests to
legacy_staging dir until stager is upgraded
to receive info from CC

Change-Id: I37980f6deddc7b10d4eab0c3b71394723cd71e26
3f14f10
@bluesalt bluesalt Clean up existing legacy echo server
When re-running dev_setup script, the existing legacy echo server needs
to be stopped first for it holds the port.The old soft link
"/etc/init.d/echoserver" also needs to be removed or the link to new
echoserver will fail to be created.Besides, the legacy echo server under
both "tmp" directory and "CLOUDFOUNDRY_HOME/.deployments/devbox/deploy"
directory should be cleaned.

Change-Id: I4c58ef2d68d4a37a8a7bd2b8db8c9b7aec236afe
1b4764f
Commits on Sep 03, 2012
@bluesalt bluesalt Merge "Clean up existing legacy echo server" e7e6d5b
Commits on Sep 05, 2012
@andl andl Merge "[dev_setup] remove hard code label in tags field." 60d607e
Jennifer Hickey Improve process for adding runtimes: DEA
- Remove runtime info from DEA config

- Fix runtimes.yml indentation

- Add Java 6 JAVA_HOME to runtimes.yml
Change-Id: Ica8b42f32042dce18ce533f82be4ca7d26dcd3a7
9d1fe38
Commits on Sep 10, 2012
Jennifer Hickey Improve process for adding runtimes and frameworks: Stager
- Add platform config to Stager

- Remove unused staging manifests from Stager

Change-Id: I002f3e58185cf2dddeb5256e6a7925b163dfaef3
36f711c
Commits on Sep 12, 2012
Jennifer Hickey Remove CC Staging Configuration
- Remove unused staging props from
CC config

- Remove platform config from CC

Change-Id: I61efb6f689e1e9f74787ae2e83d8034def621e47
352886c
Harshawardhan Gadgil Move installation of couchdb dependencies
from essentials recipe to couchdb recipe

Change-Id: Iec790273279fb3d2ceaecb9cd0aab0dc7b671409
199eb4f
Commits on Sep 17, 2012
Jennifer Hickey Merge "Remove CC Staging Configuration" 61738e3
Commits on Sep 19, 2012
Jennifer Hickey Sinatra runtime detection compatible with Ruby 1.8
- Fix regex to work with vmc run with Ruby 1.8

Change-Id: Iac104f43c8a1ab7ce8db2b756378afd06e358f5b
ab57b5c
Commits on Sep 21, 2012
Haipeng Wu [dev_setup] move cc/dea/.. to be vcap submodules
Change-Id: Iba85188e7d4143b205787e661d08ee83fc1b52a9
499c1f8
Commits on Sep 24, 2012
Haipeng Wu [dev_setup] fix gem conflict when activating nats
Change-Id: I0952a941d85e8bafbdc58a90f814e1299b6f4c41
8a51384
Commits on Sep 27, 2012
Haipeng Wu [dev_setup] install redis along with cc
Change-Id: I6dcc5b95a624569d4f3616c6d12d8dd8d45d5263
a023a09
Commits on Oct 02, 2012
Jennifer Hickey Make all runtime versions String types
Change-Id: I5539b8af99c68c4ef0136907ffdb03ea89d86a5c
3cad0a4
Commits on Oct 11, 2012
@mariash mariash [dev_setup] Add Node.js to Ruby path
to support execjs gem

Change-Id: I8e7017cf8cecbb4f19ca07d7ea5ce614bfe42e80
687dd25
Commits on Oct 18, 2012
Haipeng Wu [dev_setup] keep chef version to be 10.12.0
Recently, chef has upgraded to 10.16, syntax changed a bit,
but original still worked. Let's keep it to be 10.12 to avoid
syntax conflict in chef's future version.

Change-Id: I5017bb44a41195a8167f1cbe95e472cb1a887874
3aa561a
Commits on Oct 22, 2012
Haipeng Wu Merge "[dev_setup] move cc/dea/.. to be vcap submodules" 5469917
Commits on Oct 24, 2012
Haipeng Wu [bugfix] nginx failure caused by occupied port 80
It happened occasionally that port 80 was occupied by apache
while starting nginx. The root cause is apache2 can't be
stopped if php exists on the workstation.

Change-Id: Iba9f2c52d987438fc3f6ba9f8601c8407db747bf
a053836
Haipeng Wu [bugfix] postgresql failure caused by libpq missed
Libpq5 is in cookbook "essentials", and postgresql is in cookbook
"postgresql", we explicitly specify the squence.

Change-Id: I6f63171047964d4543a0023c0990e71760e12759
c602d1e
Haipeng Wu Merge "[bugfix] postgresql failure caused by libpq missed" 8851a7b
Commits on Oct 27, 2012
Haipeng Wu [dev_setup] dependency missed for postgresql
acmdb/ccdb/uaadb contain cookbook postgresql, which has a
dependency on cookbook essentials.

Change-Id: Ia971feae5113a91f0794d60c5c549ac8730a5cec
db7c874
Commits on Oct 29, 2012
Jennifer Hickey Add Ruby 1.9.3
- Add new Ruby 1.9.3 runtime

- Modify Ruby cookbook to allow different versions
of installed gems such as Rake for each Ruby runtime

- Bump stager with Ruby cache dir rename
Jennifer Hickey (1):
      Bump vcap-staging

Maria Shaldybina (3):
      Bump vcap-staging for TMPDIR and fixes
      Make gem installation see dependent gems
      Bump vcap-staging for node-gyp

Change-Id: I34b16d828e204fb6967de8f1699ef41c81336bac
bcdde1b
Commits on Nov 02, 2012
Jennifer Hickey Use the most specific runtime versions
Change-Id: Ic2fe956a2a590e7cfc341d8948e6ed5e8aac44f7
6c2c0e1
Commits on Nov 07, 2012
Jennifer Hickey Add status, series, category to runtime info
- Specify runtime status (Current, Next, Deprecated)

- Specify runtime series (i.e. "node08" may be a series
for Current, Next, and Deprecated 0.8.x versions)

- Specify runtime category (all javas, all nodes, etc)

Change-Id: I8265291add840f3eeb4c499087b53d69245873b2
7ca8834
Commits on Nov 12, 2012
@mariash mariash [dev_setup] Update bundler to 1.2.1
Change-Id: Ia487840a9f3b9b25497643c7f00adaed18cefb50
186ec83
Commits on Nov 13, 2012
Haipeng Wu 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
431267d
Commits on Nov 15, 2012
Haipeng Wu [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
8543765
Commits on Nov 19, 2012
Haipeng Wu [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
47de435
Harshawardhan Gadgil 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
fc8c630
Commits on Nov 21, 2012
Haipeng Wu remove service filesystem from default list
Change-Id: I94023e512f1c6c35359156f273d776b0cf7baaca
2038b1c
Harshawardhan Gadgil Merge "Dev-setup for multiple redis version" d58873d
Commits on Nov 22, 2012
Haipeng Wu [dev_setup] apply the upload patch for nginx
Change-Id: I5085c74deb564062911324a68f275631cd0be830
5aa9fb6
Commits on Nov 26, 2012
Haipeng Wu [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
9ab4079
Commits on Nov 27, 2012
Haipeng Wu 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
7d78a28
Commits on Nov 29, 2012
April Yu change tests submodule from old BVT to vcap-yeti
Change-Id: I34fcc891f1d2133323fec7429e44df460137af73
Signed-off-by: chuny <chuny@chuny.(none)>
2b3e231
Commits on Dec 04, 2012
Haipeng Wu [dev_setup] support java7 runtime
Change-Id: I5f3bfb873f8d1aa335c097a58cf9f3f3b5598610
0391d3f
Commits on Dec 05, 2012
@andyzh andyzh support rabbit for multi version
Change-Id: I47142f92c6b4d51c433fdd7ba9bbf761d2e7b9fe
731e1df
Commits on Dec 11, 2012
Haipeng Wu 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
73c6886
Commits on Dec 14, 2012
@mariash mariash 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
cb7ba19
Commits on Dec 17, 2012
@figof figof add service timeout for echo gateway
Change-Id: I97d16d8a8ab31034a0a48a38051f58e95a2e9eb6
f1b168e
@mariash mariash Merge "Bump stager for assets precompilation" 6bd567e
Commits on Dec 27, 2012
Haipeng Wu 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
cafa0d5
Commits on Jan 04, 2013
@mariash mariash Merge "[dev_setup] Update bundler to 1.2.1" c750f0a
Commits on Jan 05, 2013
Haipeng Wu keep blobstore client to be 0.4.0
dev-setup was broken by blobstore_client upgrade

Change-Id: Ic6e9cae766c40577e1a44a3be037d4ae0a7db4ab
817c7cf
Commits on Jan 15, 2013
Haipeng Wu update README
Change-Id: I3cb3e63fada40dc95388a2fb47f2f587269194ca
c836723
Commits on Feb 01, 2013
@jfarrell jfarrell Downloading app fails with nginx 405 Not Allowed
When downloading an app with GET /apps/:name/application fails with
nginx 405 Not Allowed due to bad route in nginx cc conf.

Change-Id: I32fa1d11231316c4ce0ff3746292f668ec5086ec
f52135f
Commits on Feb 12, 2013
@gramos gramos FIX chef dependency problem,
installing net-ssh and net-ssh-gateway first
d6b04a6
Commits on Feb 14, 2013
@dsyer dsyer Merge pull request #225 from gramos/fix-net-ssh-dependency-error
* fix-net-ssh-dependency-error:
  FIX chef dependency problem, installing net-ssh and net-ssh-gateway first
872b1e3
@mreider mreider Update README.md 8ce4ba4
Commits on Feb 18, 2013
@yangkookkim yangkookkim Make cf_local_ip() to use proxy's ip to determin local addr if the ma…
…chine is behind proxy
37a8233
@yangkookkim yangkookkim HTTP_PROXY is used, not https_proxy 695fd2f
Commits on Jul 01, 2013
@jacopen jacopen Fix endpoint to check web conectivity.
vcap_dev_setup fails because api.cloudfoundry.com reached end of service.

Change URI
http://api.cloudfoundry.com/info -> http://api.run.pivotal.io/info
b7f4c34
Commits on Jul 31, 2013
@mariash mariash Merge pull request #231 from jacopen/master
Fix endpoint to check web conectivity
9ae0ea1
Commits on Aug 28, 2013
@mreider mreider new license 754bdb8