Keesaco / KeesaFlo

A cloud-based flow cytometry web application
Other
6 stars 0 forks source link

Instance Manager #117

Closed RoganMurley closed 10 years ago

RoganMurley commented 10 years ago

Automatically manages worker instances. Ensures that there are an appropriate ratio of instances to tasks and that there are a minimum or maximum number of instances running.

Other changes include saving instance logs to cloud storage on termination and minor bug fixes.

McCrea commented 10 years ago

I think this pull request may have gained some commits when I filter-branch'd the private key out. Which commit should be the first one? (Also I think I said I'd review this in a couple of minutes about three hours ago; sorry)

RoganMurley commented 10 years ago

No worries. I believe the first commit is 49b9fd88f1.

McCrea commented 10 years ago

Guessed as much. My guess is that your pull tried to merge in the different tree resulting from the branch filter. I'm going to close this pull request, move your changes to another branch, and create another pull request.

RoganMurley commented 10 years ago

Good call. I'm on my phone at the moment so can't do much sorry!

McCrea commented 10 years ago

It looks like you've not merged development into your branch for some time, and that's making moving the commits to another branch surprisingly non-trivial. If that's the case, could you merge development into your branch and push the merge commit? (I'm getting a number of conflicts) If that's not the case, I'll try again later.

RoganMurley commented 10 years ago

You weren't joking, that really wasn't trivial. I've just pushed and changes are live on my version.

McCrea commented 10 years ago

Yes, after the first few conflicts I started to get the impression it would probably be done better by someone who knew that particular new code. Where exactly did you push to? I can't find any new changes on your branch.

RoganMurley commented 10 years ago

Sorry, apparently I didn't actually push. Should be fine now.

McCrea commented 10 years ago

I plan to merge this soon so long as there are no objections.

hazeld commented 10 years ago

Yeah, all looks fine to me.