Follow

ใƒˆใ‚ฅใƒผใƒˆใฎ้…้”ใฎ้ซ˜้€ŸๅŒ–ใซ้€ฒๆ—ใŒใ‚ใฃใŸใ‚ˆใ†ใงใ™ใ€‚ๅค‰ๆ›ด็‚นใ‚‚่ฆ‹ใšใซใพใƒผใ˜๏ผ

$ git fetch upstream
:
From github.com/tootsuite/mastodon
c4a67d574..d42015ee2 feature-request-pool -> upstream/feature-request-pool
:
$ git merge upstream/feature-request-pool
Merge made by the 'recursive' strategy.
app/lib/connection_pool/shared_connection_pool.rb | 53 +++++++++++++++++++++-
app/lib/connection_pool/shared_timed_stack.rb | 53 +++++++++++++++-------
app/lib/request_pool.rb | 43 +++++-------------
.../connection_pool/shared_connection_pool_spec.rb | 23 ++++++++--
.../lib/connection_pool/shared_timed_stack_spec.rb | 37 +++++++++------
5 files changed, 144 insertions(+), 65 deletions(-)
$ git push

ยท ยท Web ยท 0 ยท 2 ยท 2
Sign in to participate in the conversation
zundon

Zundon is a single user instance as home of @zundan as well as a test bed for changes of the code.