json-rpc icon indicating copy to clipboard operation
json-rpc copied to clipboard

FIX: removed pull requests.

Open pavlov99 opened this issue 7 years ago • 2 comments

During rebase on master branch several important pull requests were missing! Manually merge them.

  • [x] https://github.com/pavlov99/json-rpc/pull/45
  • [ ] https://github.com/pavlov99/json-rpc/pull/49
  • [ ] https://github.com/pavlov99/json-rpc/pull/61
  • [ ] https://github.com/pavlov99/json-rpc/pull/62
  • [ ] https://github.com/pavlov99/json-rpc/pull/64
  • [x] https://github.com/pavlov99/json-rpc/pull/65
  • [ ] https://github.com/pavlov99/json-rpc/pull/67
  • [ ] https://github.com/pavlov99/json-rpc/pull/68

pavlov99 avatar Oct 29 '17 15:10 pavlov99

Dear @sethrh

Sorry for not coming to you for such a long time. I would like to thank you for your pull request to json-rpc library: https://github.com/pavlov99/json-rpc/pull/45

Unfortunately, because of internal rebase operations, this pull request became invalid. To fix that I applied your original commits: https://github.com/QuantumSpatialInc/json-rpc/commit/9914ab5ab2304dae9acf8bf8b35d4a20b08182ef https://github.com/QuantumSpatialInc/json-rpc/commit/60e26e3feadfb9bec9ceb6544817f773b32f6778 To the repository under your name and email. The code is copied almost verbatim: https://github.com/pavlov99/json-rpc/commit/49da13087bf58b5f6d6154e03eaade0f9afe6128

Based on the updated code I made another release for the library: https://pypi.python.org/pypi/json-rpc/1.10.5

pavlov99 avatar Oct 29 '17 15:10 pavlov99

Dear @smagafurov

Sorry for not coming to you for such a long time. I would like to thank you for your pull request to json-rpc library: https://github.com/pavlov99/json-rpc/pull/65

Unfortunately, because of internal rebase operations, this pull request became invalid. To fix that I applied your original commits: https://github.com/smagafurov/json-rpc/commit/aacdcebddaeefd972237c91322615d9cd5f45f72 https://github.com/smagafurov/json-rpc/commit/861b714a4ee654c293bac0531d8842f71f68ec3f To the repository under your name and email. The code is copied verbatim: https://github.com/pavlov99/json-rpc/commit/148ecbc0ef15ed38fb505663d8a309f3840e9f32

I was able to fix python versions support in Travis.

Based on the updated code I made another release for the library: https://pypi.python.org/pypi/json-rpc/1.10.6

I'd also copy here all of the people who up-voted your pull request:

  • @Afonasev
  • @ms-boom
  • @spumer

Thank you. Kirill.

pavlov99 avatar Oct 29 '17 16:10 pavlov99