Skip to content

Comments

Master#7

Open
jackytu wants to merge 504 commits intox-plat_devfrom
master
Open

Master#7
jackytu wants to merge 504 commits intox-plat_devfrom
master

Conversation

@jackytu
Copy link
Member

@jackytu jackytu commented Sep 28, 2013

merge with official repository

Alex Jackson and others added 30 commits November 5, 2013 15:16
Signed-off-by: Phan Le <ple@pivotallabs.com>
Signed-off-by: Phan Le <ple@pivotallabs.com>
…syslog-drain-url

Whitelist syslog_drain_url so that it appears in VCAP_SERVICES
Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>
Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>
Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>
Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>
Signed-off-by: Mark Rushakoff <mrushakoff@pivotallabs.com>
Signed-off-by Mark Rushakoff <mrushakoff@pivotallabs.com>
this allows consumers of the dea.heartbeat to trust that the heartbeat
represents the entire state of the dea.  this, in turn, allows consumers
to perform set-diff style saves. (hm9000 uses this to reduce its write
load)
[#60443956]

Signed-off-by: Eric Malm <emalm@pivotallabs.com>
The output should be already available via loggregator.

[finishes #60358368]

Signed-off-by: Phan Le <ple@pivotallabs.com>
Seems like this breaks staging

This reverts commit 2eed252.
[finishes #60536486]

Signed-off-by: Mark Rushakoff <mrushakoff@pivotallabs.com>
Signed-off-by: Phan Le <ple@pivotallabs.com>
emalm and others added 30 commits March 31, 2014 11:04
* Also modernize hash syntax and reduce multi-line calls.

Signed-off-by: Aram Price <aprice@pivotallabs.com>
* Other post-staging operations on the container occur after the timeout,
so there should be no reason for this to differ from the staging timeout
implemented in the staging script that is run in the container.

Signed-off-by: Eric Malm <emalm@pivotallabs.com>
Signed-off-by: Aram Price <aprice@pivotallabs.com>
Signed-off-by: Aram Price <aprice@pivotallabs.com>
Signed-off-by: Aram Price <aprice@pivotallabs.com>
Signed-off-by: Aram Price <aprice@pivotallabs.com>
Signed-off-by: Aram Price <aprice@pivotallabs.com>
Signed-off-by: Aram Price <aprice@pivotallabs.com>
Signed-off-by: Aram Price <aprice@pivotallabs.com>
Signed-off-by: Aram Price <aprice@pivotallabs.com>
* Also add better error-case handling for Task#promise_stop

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>
The goal is to get information about the buildpack used for staging
(including detected admin buildpacks) back to the CC so it can be used
to populate app usage events.

Highlights:
* Add path of buildpack used for staging to staging_info.yml
* Refactor buildpack manager out of the staging workspace
  - Staging task creates and holds a reference to the buildpack manager
  - Buildpack manager passed to workspace prepare
  - Consolidated builpack ordering tests in buildpack manager
* Add methods to buildpack manager to return buildpack key or a system
  buildpack url from a path
* Return the buildpack url (system or custom) and the buildpack key in
  the staging complete message
Signed-off-by: Eric Malm <emalm@pivotallabs.com>
Pending changes to use bosh deployed admin buildpacks in place of
system buildpacks removes the need to pass system buildpack urls
back to the cloud controller.

Signed-off-by: Eric Malm <emalm@pivotallabs.com>
Signed-off-by: Eric Malm <emalm@pivotallabs.com>
* Resolved some conflicts caused by changes from PR cloudfoundry-attic#114

Signed-off-by: Ruth Byers <rbyers@pivotallabs.com>

Conflicts:
	lib/dea/staging/buildpack_manager.rb
	lib/dea/staging/staging_task_workspace.rb
	spec/unit/staging/buildpack_manager_spec.rb
	spec/unit/staging/staging_task_workspace_spec.rb
The problem doesn't appear until you start mixing threads (EM) and Fibers.
Signed-off-by: Phan Le <ple@pivotallabs.com>
Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>
[#69197868]

Signed-off-by: Phan Le <ple@pivotallabs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.