Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed fallout from the recent rust update afflicting the profiler #559

Merged
merged 2 commits into from Jul 10, 2013
Merged

fixed fallout from the recent rust update afflicting the profiler #559

merged 2 commits into from Jul 10, 2013

Conversation

@tikue
Copy link

tikue commented Jul 4, 2013

r? @metajack this includes the rust-azure pointer change
@metajack
Copy link
Contributor

metajack commented Jul 4, 2013

You seem to have accidentally included a rust-azure upgrade. Was that intentional?

Otherwise this looks good.
@tikue
Copy link
Author

tikue commented Jul 4, 2013

Whoops, I tried to have it point to my azure commit; that was silly.
Will fix soon.
@metajack
Copy link
Contributor

metajack commented Jul 8, 2013

The rust-azure pointed shouldn't be moved at all. It should stay at 6daaffe (which is what master-update points to currently).
@tikue
Copy link
Author

tikue commented Jul 8, 2013

Should be good now.
@jdm
Copy link
Member

jdm commented Jul 10, 2013

We'll want to make sure this applies (and builds) on top of #563.
@metajack
Copy link
Contributor

metajack commented Jul 10, 2013

r+ now, but needs rebase.
@tikue
Copy link
Author

tikue commented Jul 10, 2013

rebased and ready to merge. note that I added another commit which fixes an issue related to resizing with multiple pipelines; probably needs another r?
@metajack
Copy link
Contributor

metajack commented Jul 10, 2013

Please rewrite the first commit to remove the failed merge markers.
Tim Kuehn added 2 commits Jul 4, 2013
Tim Kuehn
mildly cleaner profiling code in util::time
9f6cbf9
Tim Kuehn
scripts from inactive pipelines resize upon navigating to their pages
Loading status checks…
8b8d2f5
@metajack

This comment has been minimized.

Sign in to view
Copy link

metajack commented on 8b8d2f5 Jul 10, 2013

r+
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on 8b8d2f5 Jul 10, 2013

saw approval from metajack
at tikue@8b8d2f5

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Jul 10, 2013

merging tkuehn/servo/master = 8b8d2f5 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Jul 10, 2013

tkuehn/servo/master = 8b8d2f5 merged ok, testing candidate = b0495eb

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Jul 10, 2013

all tests pass:
http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/113
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/67

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Jul 10, 2013

fast-forwarding master to auto = b0495eb
bors-servo pushed a commit that referenced this pull request Jul 10, 2013
bors-servo
auto merge of #559 : tkuehn/servo/master, r=metajack
b0495eb 
r? @metajack this includes the rust-azure pointer change
@bors-servo bors-servo merged commit 8b8d2f5 into servo:master Jul 10, 2013
1 check passed
1 check passed
default all tests passed
ChrisParis pushed a commit to ChrisParis/servo that referenced this pull request Sep 7, 2014
@Ms2ger
Merge pull request servo#559 from Ms2ger/ms-interface
3eabe3d 
Remove some useless tests.
@jdm jdm mentioned this pull request Nov 5, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@tikue @metajack @jdm @bors-servo
You can’t perform that action at this time.