/juju

Merge master into maas-spaces and fix conflicts. #4279

Merged
merged 3 commits into from Feb 3, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@dimitern @jujubot
@dimitern
Contributor

dimitern commented Feb 3, 2016

No description provided.

jujubot and others added some commits Feb 2, 2016

@jujubot
Fixed merge conflicts from master
9296a57
@jujubot
Merge pull request #4275 from davecheney/pprof-followup 
cmd/pprof: address review followups

Address review comments raised during the 1.25 backport.

- Added package commentary identifying the changes made in this fork.
- Added tests of the pprof server and Start/stop logic.

(Review request: http://reviews.vapour.ws/r/3713/)
b9f4246
Fixed a few more failures due to the API rename
fad668c
@dimitern
Contributor

dimitern commented Feb 3, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Feb 3, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Feb 3, 2016

@jujubot
Merge pull request #4279 from dimitern/maas-spaces-merge-master 
Merge master into maas-spaces and fix conflicts.
38acc94

@jujubot jujubot merged commit 38acc94 into juju:maas-spaces Feb 3, 2016

@dimitern dimitern deleted the dimitern:maas-spaces-merge-master branch Feb 3, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment