[GitHub] thrift issue #1479: THRIFT-4474: generate PHP code use PSR-4 style default

2018-03-14 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1479 @dcelasun squashed ---

[GitHub] thrift pull request #1479: THRIFT-4474: generate PHP code use PSR-4 style de...

2018-03-13 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1479#discussion_r174337789 --- Diff: lib/php/README.md --- @@ -20,34 +19,46 @@ KIND, either express or implied. See the License for the specific language governing permissions

[GitHub] thrift pull request #1498: THRIFT-4498: add phpcs back

2018-02-22 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1498 THRIFT-4498: add phpcs back ref <https://issues.apache.org/jira/browse/THRIFT-4498> You can merge this pull request into a Git repository by running: $ git pull https://gith

[GitHub] thrift issue #1479: THRIFT-4474: generate PHP code use PSR-4 style default

2018-01-30 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1479 Personally, I think we can mark classmap/old-style PHP compiler deprecated. And can be removed in future. And, ThriftClassLoader can also be removed in future, to migrate composer

[GitHub] thrift issue #1479: THRIFT-4474: generate PHP code use PSR-4 style default

2018-01-30 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1479 There are some break changes: 1. for generated code, old struct is `Types.php` for all args, results, `.php` for `ServiceIf`, `ServiceClient`, etc. new struct is `.php

[GitHub] thrift issue #1484: TBufferedTransport must have underlying transport

2018-01-30 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1484 CI isn't stable. It's so headache. :( ---

[GitHub] thrift pull request #1484: TBufferedTransport must have underlying transport

2018-01-29 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1484#discussion_r164633942 --- Diff: lib/php/lib/Transport/TTransport.php --- @@ -22,6 +22,7 @@ namespace Thrift\Transport; +use Thrift\Exception

[GitHub] thrift pull request #1484: TBufferedTransport must have underlying transport

2018-01-29 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1484#discussion_r164633860 --- Diff: lib/php/lib/Transport/TBufferedTransport.php --- @@ -22,6 +22,7 @@ namespace Thrift\Transport; +use Thrift\Exception

[GitHub] thrift pull request #1484: TBufferedTransport must have underlying transport

2018-01-29 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1484#discussion_r164633628 --- Diff: lib/php/lib/Factory/TStringFuncFactory.php --- @@ -21,8 +21,9 @@ namespace Thrift\Factory; -use Thrift\StringFunc\Mbstring

[GitHub] thrift pull request #1484: TBufferedTransport must have underlying transport

2018-01-29 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1484#discussion_r164633402 --- Diff: lib/php/lib/Transport/TBufferedTransport.php --- @@ -78,11 +69,26 @@ public function __construct($transport = null, $rBufSize = 512, $wBufSize

[GitHub] thrift pull request #1484: TBufferedTransport must have underlying transport

2018-01-29 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1484 TBufferedTransport must have underlying transport ref: https://issues.apache.org/jira/browse/THRIFT-4477 You can merge this pull request into a Git repository by running: $ git pull https

[GitHub] thrift pull request #1482: THRIFT-4475: check lib/php/test for PSR-2

2018-01-25 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1482 THRIFT-4475: check lib/php/test for PSR-2 ref: https://issues.apache.org/jira/browse/THRIFT-4475 You can merge this pull request into a Git repository by running: $ git pull https

[GitHub] thrift pull request #1481: THRIFT-4475: check lib/php/test for PSR-2

2018-01-25 Thread RobberPhex
Github user RobberPhex closed the pull request at: https://github.com/apache/thrift/pull/1481 ---

[GitHub] thrift pull request #1481: THRIFT-4475: check lib/php/test for PSR-2

2018-01-25 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1481 THRIFT-4475: check lib/php/test for PSR-2 ref: https://issues.apache.org/jira/browse/THRIFT-4475 You can merge this pull request into a Git repository by running: $ git pull https

[GitHub] thrift pull request #1479: THRIFT-4474: generate PHP code use PSR-4 style de...

2018-01-24 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1479 THRIFT-4474: generate PHP code use PSR-4 style default ref: https://issues.apache.org/jira/browse/THRIFT-4474 You can merge this pull request into a Git repository by running: $ git pull

[GitHub] thrift issue #1451: THRIFT-4438: delete trusty and requrie php56

2018-01-23 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1451 Considering that trusty haven't reached end of life, so I close this pr, and keep trusty in CI. ---

[GitHub] thrift pull request #1451: THRIFT-4438: delete trusty and requrie php56

2018-01-23 Thread RobberPhex
Github user RobberPhex closed the pull request at: https://github.com/apache/thrift/pull/1451 ---

[GitHub] thrift pull request #1472: THRIFT-4460: PHP Library use PSR-2

2018-01-22 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1472#discussion_r163079208 --- Diff: build/docker/scripts/sca.sh --- @@ -49,6 +49,10 @@ flake8 --ignore=E501 test/test.py flake8 --ignore=E501,E722 test/crossrunner

[GitHub] thrift pull request #1473: generate PHP code match psr2

2018-01-17 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1473 generate PHP code match psr2 ref: https://issues.apache.org/jira/browse/THRIFT-4463 You can merge this pull request into a Git repository by running: $ git pull https://github.com

[GitHub] thrift issue #1472: THRIFT-4460: PHP Library use PSR-2

2018-01-16 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1472 rebased and squashed ---

[GitHub] thrift pull request #1472: THRIFT-4460: PHP Library use PSR-2

2018-01-15 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1472 THRIFT-4460: PHP Library use PSR-2 ref https://issues.apache.org/jira/browse/THRIFT-4460 You can merge this pull request into a Git repository by running: $ git pull https://github.com

[GitHub] thrift pull request #1464: THRIFT-4452: optimize Dockerfile

2018-01-12 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1464#discussion_r161216512 --- Diff: build/docker/ubuntu-artful/Dockerfile --- @@ -41,10 +43,21 @@ RUN apt-get update && \ # dotnet (core) RUN cu

[GitHub] thrift pull request #1464: THRIFT-4452: optimize Dockerfile

2018-01-11 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1464 THRIFT-4452: optimize Dockerfile Docker build flow: 1. add all repo 2. `apt-get update` (only one time) 3. install dependencies You can merge this pull request into a Git

[jira] [Commented] (THRIFT-3983) libthrift is deployed on central with pom packaging instead of jar

2018-01-04 Thread RobberPhex (JIRA)
[ https://issues.apache.org/jira/browse/THRIFT-3983?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16311420#comment-16311420 ] RobberPhex commented on THRIFT-3983: This issue can be closed. > libthrift is deployed on cent

[jira] [Created] (THRIFT-4442) release 0.11.0 to https://bintray.com/apache/thrift

2018-01-04 Thread RobberPhex (JIRA)
RobberPhex created THRIFT-4442: -- Summary: release 0.11.0 to https://bintray.com/apache/thrift Key: THRIFT-4442 URL: https://issues.apache.org/jira/browse/THRIFT-4442 Project: Thrift Issue Type

[jira] [Commented] (THRIFT-4425) Publish Thrift v0.11 to packagist.org

2018-01-04 Thread RobberPhex (JIRA)
[ https://issues.apache.org/jira/browse/THRIFT-4425?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16311135#comment-16311135 ] RobberPhex commented on THRIFT-4425: 0.11.0 is appeared at https://packagist.org/packages/apache

[GitHub] thrift pull request #1456: THRIFT-3983: Fix generated maven packaging

2018-01-03 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1456 THRIFT-3983: Fix generated maven packaging ref <https://issues.apache.org/jira/projects/THRIFT/issues/THRIFT-3983> --- * The origin PR is <https://github.com/apache/thrift/

[jira] [Commented] (THRIFT-4439) Shouldn't download dart.deb directly.

2018-01-02 Thread RobberPhex (JIRA)
[ https://issues.apache.org/jira/browse/THRIFT-4439?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16309039#comment-16309039 ] RobberPhex commented on THRIFT-4439: [~jking3] Just retrigger ci, it's success at [apache repo|https

[jira] [Created] (THRIFT-4440) rm `build/docker/ubuntu-trusty/Dockerfile.orig`

2018-01-02 Thread RobberPhex (JIRA)
RobberPhex created THRIFT-4440: -- Summary: rm `build/docker/ubuntu-trusty/Dockerfile.orig` Key: THRIFT-4440 URL: https://issues.apache.org/jira/browse/THRIFT-4440 Project: Thrift Issue Type

[GitHub] thrift pull request #1455: THRIFT-4440: cleanup *.orig

2018-01-02 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1455 THRIFT-4440: cleanup *.orig It seems like `build/docker/ubuntu-trusty/Dockerfile.orig` is useless. You can merge this pull request into a Git repository by running: $ git pull https

[jira] [Commented] (THRIFT-4361) cannot serialize set<map<i32, i64> > via extension

2017-12-31 Thread RobberPhex (JIRA)
[ https://issues.apache.org/jira/browse/THRIFT-4361?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307148#comment-16307148 ] RobberPhex commented on THRIFT-4361: This is fixed in version 0.11.0, Please close this. > can

[GitHub] thrift pull request #1453: THRIFT-4439: use dartlang repo instead of downloa...

2017-12-28 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1453 THRIFT-4439: use dartlang repo instead of download dart.deb You can merge this pull request into a Git repository by running: $ git pull https://github.com/RobberPhex/thrift dartlang

[jira] [Created] (THRIFT-4439) Shouldn't download dart.deb directly.

2017-12-28 Thread RobberPhex (JIRA)
RobberPhex created THRIFT-4439: -- Summary: Shouldn't download dart.deb directly. Key: THRIFT-4439 URL: https://issues.apache.org/jira/browse/THRIFT-4439 Project: Thrift Issue Type: Bug

[GitHub] thrift pull request #1451: THRIFT-4438: delete trusty and requrie php56

2017-12-28 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1451 THRIFT-4438: delete trusty and requrie php56 * remove support php 5.3, 5.4 and 5.5 * remove test at ubuntu trusty(trusty only have php5.5, haven't php5.6) You can merge this pull request

[jira] [Commented] (THRIFT-4423) migrate php library to psr-4

2017-12-28 Thread RobberPhex (JIRA)
[ https://issues.apache.org/jira/browse/THRIFT-4423?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16305333#comment-16305333 ] RobberPhex commented on THRIFT-4423: Finally, all test passed. [~jking3] Is this pull request OK

[jira] [Created] (THRIFT-4438) require php ^5.6 || ^7.0

2017-12-28 Thread RobberPhex (JIRA)
RobberPhex created THRIFT-4438: -- Summary: require php ^5.6 || ^7.0 Key: THRIFT-4438 URL: https://issues.apache.org/jira/browse/THRIFT-4438 Project: Thrift Issue Type: Improvement

[GitHub] thrift pull request #1445: migrate to psr-4

2017-12-13 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1445 migrate to psr-4 You can merge this pull request into a Git repository by running: $ git pull https://github.com/RobberPhex/thrift psr-4 Alternatively you can review and apply

[GitHub] thrift issue #1400: THRIFT-4374 add stdc++ back

2017-10-26 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1400 There is the [issue](https://issues.apache.org/jira/browse/THRIFT-4374) ---

[GitHub] thrift issue #1401: THRIFT-4373: Derefer PHP zval _TSPEC

2017-10-26 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1401 If we want process REFERENCE everywhere. I think we should review every line of `zval` used, is it? ---

[GitHub] thrift pull request #1401: THRIFT-4373: Derefer PHP zval _TSPEC

2017-10-26 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1401#discussion_r147051880 --- Diff: lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp --- @@ -537,6 +537,9 @@ void binary_deserialize(int8_t thrift_typeID

[GitHub] thrift pull request #1401: THRIFT-4373: Derefer PHP zval _TSPEC

2017-10-26 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1401#discussion_r147052024 --- Diff: lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp --- @@ -699,6 +702,9 @@ void binary_serialize_hashtable_key(int8_t keytype

[GitHub] thrift pull request #1401: THRIFT-4373: Derefer PHP zval _TSPEC

2017-10-26 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1401#discussion_r147052177 --- Diff: lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp --- @@ -709,6 +715,9 @@ void binary_serialize(int8_t thrift_typeID, PHPOutputTransport

[GitHub] thrift pull request #1399: THRIFT-4370: build generated code before running ...

2017-10-25 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1399#discussion_r147048687 --- Diff: lib/py/setup.py --- @@ -22,7 +22,7 @@ import sys try: from setuptools import setup, Extension -except: +except

[GitHub] thrift pull request #1400: add stdc++ back

2017-10-25 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1400 add stdc++ back at Linux x86, will cause errror: # php -d extension=./thrift_protocol.so -m PHP Warning: PHP Startup: Unable to load dynamic library

[GitHub] thrift issue #1391: Fix segment fault at thrift_protocol extension

2017-10-23 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1391 @jeking3 Currently, I just remove PHP5 support at PHP extension(thrift_protocol), PHP library is still support PHP5. So, I think this PR is good. --- If PHP5

[GitHub] thrift issue #1391: Fix segment fault at thrift_protocol extension

2017-10-22 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1391 at job `Autotools (Ubuntu Trusty)`, it just run `make check`, so php extension cannot be compiled. at job `Cross Language Tests`, it needn't php extension. So, I think

[GitHub] thrift pull request #1391: Fix segment fault at thrift_protocol extension

2017-10-22 Thread RobberPhex
Github user RobberPhex commented on a diff in the pull request: https://github.com/apache/thrift/pull/1391#discussion_r146125400 --- Diff: lib/php/src/ext/thrift_protocol/config.m4 --- @@ -1,25 +1,27 @@ -dnl Copyright (C) 2009 Facebook -dnl Copying and distribution

[GitHub] thrift issue #1391: Fix segment fault at thrift_protocol extension

2017-10-21 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1391 Hi, about license. `Copyright (C) 2009 Facebook` at file `lib/php/src/ext/thrift_protocol/config.m4` was add by commit f82aee5087bd62989482f5c532cbd80f97a39b7f. But before

[GitHub] thrift issue #1391: Fix segment fault at thrift_protocol extension

2017-10-20 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1391 build job 4 failed due to https://issues.apache.org/jira/browse/THRIFT-2913. And, appveyor build queued. but, same commit at my repo CI is success: https://ci.appveyor.com/project

[GitHub] thrift issue #1391: Fix segment fault at thrift_protocol extension

2017-10-20 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1391 this pr fix [`THRIFT-4356`](https://issues.apache.org/jira/browse/THRIFT-4356) and [`THRIFT-4353`](https://issues.apache.org/jira/browse/THRIFT-4353). --- And, this work

[GitHub] thrift pull request #1385: THRIFT-4356 thrift_protocol call Transport cause ...

2017-10-04 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1385 THRIFT-4356 thrift_protocol call Transport cause Segmentation fault ref: <https://issues.apache.org/jira/browse/THRIFT-4356> You can merge this pull request into a Git repository by r

[GitHub] thrift pull request #1022: THRIFT-3845

2017-10-04 Thread RobberPhex
Github user RobberPhex closed the pull request at: https://github.com/apache/thrift/pull/1022 ---

[GitHub] thrift pull request #1384: THRIFT-4354 TSocket block on read

2017-10-03 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1384 THRIFT-4354 TSocket block on read ref <https://issues.apache.org/jira/browse/THRIFT-4354> You can merge this pull request into a Git repository by running: $ git pull https://gith

[GitHub] thrift pull request #1383: THRIFT-4353 cannot read via thrift_protocol at se...

2017-10-03 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1383 THRIFT-4353 cannot read via thrift_protocol at server side ref <https://issues.apache.org/jira/browse/THRIFT-4353> You can merge this pull request into a Git repository by running:

[GitHub] thrift issue #1161: THRIFT-4034 CMake doesn't work to build compiler

2017-01-22 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1161 @jeking3 I think `/CMakeList.txt` is the only entrance, we can just improve document, to fix this issue, is it? --- If your project is set up for it, you can reply to this email and have your

[GitHub] thrift issue #1161: THRIFT-4034 CMake doesn't work to build compiler

2017-01-22 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1161 @jeking3 fixed --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so

[GitHub] thrift issue #1161: THRIFT-4034 CMake doesn't work to build compiler

2017-01-22 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1161 All ci have passed, finally. Please merge this pr. :) --- change list: * appveyor have installed openssl, removed installation of openssl * remove HACK

[GitHub] thrift issue #1086: THRIFT-3926 Emit an error for bad http status code

2017-01-19 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1086 status code not equal 200 doesn't means it's a `TApplicationException`. * When status code is 301/3xx, should thrift client follow the redirect? * In some server implements, server

[GitHub] thrift issue #1161: THRIFT-4034 CMake doesn't work to build compiler

2017-01-19 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1161 https://issues.apache.org/jira/browse/THRIFT-4034 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have

[GitHub] thrift pull request #1161: Thrift-4034 CMake doesn't work to build compiler

2017-01-19 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1161 Thrift-4034 CMake doesn't work to build compiler You can merge this pull request into a Git repository by running: $ git pull https://github.com/RobberPhex/thrift THRIFT-4034

[GitHub] thrift issue #1089: THRIFT-3929 php namespace remove tail "\\"

2016-09-21 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1089 @jfarrell Can you review this pr? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature

[jira] [Commented] (THRIFT-3929) PHP "nsglobal" Option Results in Syntax Error in Generated Code (Trailing Backslash)

2016-09-21 Thread RobberPhex (JIRA)
[ https://issues.apache.org/jira/browse/THRIFT-3929?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15508980#comment-15508980 ] RobberPhex commented on THRIFT-3929: [~jfarrell] Is there any problem in [pr 1089|https://github.com

[GitHub] thrift pull request #1089: THRIFT-3929 php namespace remove tail "\\"

2016-09-14 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1089 THRIFT-3929 php namespace remove tail "\\" when namespace is empty, and global namespace is not empty, don't add tail "\\" You can merge this pull request into a Git r

[GitHub] thrift issue #1022: THRIFT-3845

2016-07-20 Thread RobberPhex
Github user RobberPhex commented on the issue: https://github.com/apache/thrift/pull/1022 @jeking3 rebased --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so

[GitHub] thrift pull request: THRIFT-3845

2016-05-31 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1022 THRIFT-3845 use `isBinaryAccelerated` to indicate use extension `thrift_protocol`. When `TBinaryProtocolAccelerated` warped in `TMultiplexedProtocol`,extension `thrift_protocol` can

[GitHub] thrift pull request: Fix THRIFT-3844

2016-05-31 Thread RobberPhex
GitHub user RobberPhex opened a pull request: https://github.com/apache/thrift/pull/1021 Fix THRIFT-3844 update `php_thrift_protocol7.cpp` let `php_thrift_protocol` can compiled with php7.0.7 You can merge this pull request into a Git repository by running: $ git pull