Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-06-07 Thread Joris Van Remoortere

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/#review136525
---


Ship it!




Ship It!

- Joris Van Remoortere


On May 31, 2016, 5:49 a.m., Alex Clemmer wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/47577/
> ---
> 
> (Updated May 31, 2016, 5:49 a.m.)
> 
> 
> Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
> Remoortere, and Michael Park.
> 
> 
> Repository: mesos
> 
> 
> Description
> ---
> 
> Agent: Added minor changes to various .cpp files to support Windows.
> 
> 
> Diffs
> -
> 
>   src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
>   src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
>   src/files/files.cpp 873664da04d297b52846a9ea95176f96d44c97ab 
>   src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
>   src/logging/logging.cpp 7ea189950bc3c5b0bb0a31f761ad24ab6e076a77 
>   src/slave/slave.cpp c235c14814c320b4a8af8bf839ecced969de6e35 
>   src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
>   src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
>   src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
>   src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
>   src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 
> 
> Diff: https://reviews.apache.org/r/47577/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Alex Clemmer
> 
>



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-30 Thread Alex Clemmer

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/
---

(Updated May 31, 2016, 5:49 a.m.)


Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
Remoortere, and Michael Park.


Repository: mesos


Description
---

Agent: Added minor changes to various .cpp files to support Windows.


Diffs (updated)
-

  src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
  src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
  src/files/files.cpp 873664da04d297b52846a9ea95176f96d44c97ab 
  src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
  src/logging/logging.cpp 7ea189950bc3c5b0bb0a31f761ad24ab6e076a77 
  src/slave/slave.cpp c235c14814c320b4a8af8bf839ecced969de6e35 
  src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
  src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
  src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
  src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
  src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 

Diff: https://reviews.apache.org/r/47577/diff/


Testing
---


Thanks,

Alex Clemmer



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-30 Thread Alex Clemmer

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/
---

(Updated May 31, 2016, 5:34 a.m.)


Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
Remoortere, and Michael Park.


Repository: mesos


Description
---

Agent: Added minor changes to various .cpp files to support Windows.


Diffs (updated)
-

  src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
  src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
  src/files/files.cpp 074d31c116c1b9ff96262c3e0c776f38aea53d16 
  src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
  src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
  src/slave/slave.cpp c235c14814c320b4a8af8bf839ecced969de6e35 
  src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
  src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
  src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
  src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
  src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 

Diff: https://reviews.apache.org/r/47577/diff/


Testing
---


Thanks,

Alex Clemmer



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-30 Thread Alex Clemmer


> On May 31, 2016, 5:12 a.m., Joris Van Remoortere wrote:
> > src/slave/slave.cpp, lines 1032-1040
> > 
> >
> > I still think you have changes accidentally merged together.

This was intentional. One condition for the authenticateeName and the rest for 
Windows. On Posix there should be no change.


- Alex


---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/#review135592
---


On May 30, 2016, 10:19 p.m., Alex Clemmer wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/47577/
> ---
> 
> (Updated May 30, 2016, 10:19 p.m.)
> 
> 
> Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
> Remoortere, and Michael Park.
> 
> 
> Repository: mesos
> 
> 
> Description
> ---
> 
> Agent: Added minor changes to various .cpp files to support Windows.
> 
> 
> Diffs
> -
> 
>   src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
>   src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
>   src/files/files.cpp 074d31c116c1b9ff96262c3e0c776f38aea53d16 
>   src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
>   src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
>   src/slave/slave.cpp c235c14814c320b4a8af8bf839ecced969de6e35 
>   src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
>   src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
>   src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
>   src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
>   src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 
> 
> Diff: https://reviews.apache.org/r/47577/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Alex Clemmer
> 
>



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-30 Thread Joris Van Remoortere

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/#review135592
---




src/health-check/main.cpp (line 309)


No need to do this



src/slave/slave.cpp (lines 1032 - 1040)


I still think you have changes accidentally merged together.



src/zookeeper/group.cpp (lines 658 - 659)


wrapping:
```
  string path = path::join(
  znode, 
  zkBasename(membership),
  os::POSIX_PATH_SEPARATOR);
```



src/zookeeper/group.cpp (lines 699 - 700)


same as above


- Joris Van Remoortere


On May 30, 2016, 10:19 p.m., Alex Clemmer wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/47577/
> ---
> 
> (Updated May 30, 2016, 10:19 p.m.)
> 
> 
> Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
> Remoortere, and Michael Park.
> 
> 
> Repository: mesos
> 
> 
> Description
> ---
> 
> Agent: Added minor changes to various .cpp files to support Windows.
> 
> 
> Diffs
> -
> 
>   src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
>   src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
>   src/files/files.cpp 074d31c116c1b9ff96262c3e0c776f38aea53d16 
>   src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
>   src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
>   src/slave/slave.cpp c235c14814c320b4a8af8bf839ecced969de6e35 
>   src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
>   src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
>   src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
>   src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
>   src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 
> 
> Diff: https://reviews.apache.org/r/47577/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Alex Clemmer
> 
>



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-30 Thread Alex Clemmer

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/
---

(Updated May 30, 2016, 10:19 p.m.)


Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
Remoortere, and Michael Park.


Repository: mesos


Description
---

Agent: Added minor changes to various .cpp files to support Windows.


Diffs (updated)
-

  src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
  src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
  src/files/files.cpp 074d31c116c1b9ff96262c3e0c776f38aea53d16 
  src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
  src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
  src/slave/slave.cpp c235c14814c320b4a8af8bf839ecced969de6e35 
  src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
  src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
  src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
  src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
  src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 

Diff: https://reviews.apache.org/r/47577/diff/


Testing
---


Thanks,

Alex Clemmer



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-30 Thread Alex Clemmer

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/
---

(Updated May 30, 2016, 5:44 p.m.)


Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
Remoortere, and Michael Park.


Changes
---

master rebase


Repository: mesos


Description
---

Agent: Added minor changes to various .cpp files to support Windows.


Diffs (updated)
-

  src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
  src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
  src/files/files.cpp 074d31c116c1b9ff96262c3e0c776f38aea53d16 
  src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
  src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
  src/slave/slave.cpp c235c14814c320b4a8af8bf839ecced969de6e35 
  src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
  src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
  src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
  src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
  src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 

Diff: https://reviews.apache.org/r/47577/diff/


Testing
---


Thanks,

Alex Clemmer



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-27 Thread Alex Clemmer

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/
---

(Updated May 28, 2016, 5:11 a.m.)


Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
Remoortere, and Michael Park.


Repository: mesos


Description
---

Agent: Added minor changes to various .cpp files to support Windows.


Diffs (updated)
-

  src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
  src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
  src/files/files.cpp 074d31c116c1b9ff96262c3e0c776f38aea53d16 
  src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
  src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
  src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
  src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
  src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
  src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
  src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 

Diff: https://reviews.apache.org/r/47577/diff/


Testing
---


Thanks,

Alex Clemmer



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-27 Thread Alex Clemmer

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/
---

(Updated May 28, 2016, 2:21 a.m.)


Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
Remoortere, and Michael Park.


Changes
---

master rebased


Repository: mesos


Description
---

Agent: Added minor changes to various .cpp files to support Windows.


Diffs (updated)
-

  src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
  src/docker/executor.cpp f4796e4aa9951c30ada7feb44fb5d037895becce 
  src/files/files.cpp 074d31c116c1b9ff96262c3e0c776f38aea53d16 
  src/health-check/main.cpp 3cf858303ee84f43aedfe5ac71949b786276e463 
  src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
  src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
  src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
  src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
  src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
  src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 

Diff: https://reviews.apache.org/r/47577/diff/


Testing
---


Thanks,

Alex Clemmer



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-24 Thread Joris Van Remoortere

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/#review134663
---




src/docker/docker.cpp (lines 451 - 452)


we can rename these as we did the others:
`stdout_fd` -> `_stdout`.



src/files/files.cpp (lines 560 - 561)


Did we rename this to `PATH_SEPARATOR`?
Does this need to be rebased?



src/health-check/main.cpp (lines 278 - 317)


These changes are not relevant any more.
I think this review needs to be rebased.



src/logging/logging.cpp (line 203)


Indentation. Missing period. Don't need the parantheses, wrap with 
backticks instead.



src/uri/fetcher.hpp (lines 42 - 48)


Not sure what's going on here. Add a comment? Is this still relevant?



src/uri/fetcher.cpp (lines 49 - 52)


Can you reference this JIRA you created to add support for hadoop files?

It seems you also need one for docker?



src/zookeeper/group.cpp (line 659)


rebase.



src/zookeeper/group.cpp (line 700)


rebase.


- Joris Van Remoortere


On May 19, 2016, 4:07 a.m., Alex Clemmer wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/47577/
> ---
> 
> (Updated May 19, 2016, 4:07 a.m.)
> 
> 
> Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
> Remoortere, and Michael Park.
> 
> 
> Repository: mesos
> 
> 
> Description
> ---
> 
> Agent: Added minor changes to various .cpp files to support Windows.
> 
> 
> Diffs
> -
> 
>   src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
>   src/docker/executor.cpp d60addcbe4a1869945ce42f4bb4b1e80e3f29f19 
>   src/files/files.cpp 4e916101b378b0e9032a08a3f6c73e195b2a08a1 
>   src/health-check/main.cpp 98ea5d3675f088e3a341037dcee92695e4857999 
>   src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
>   src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
>   src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
>   src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
>   src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
>   src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 
> 
> Diff: https://reviews.apache.org/r/47577/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Alex Clemmer
> 
>



Re: Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-18 Thread Mesos ReviewBot

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/#review133871
---



Bad patch!

Reviews applied: [47577, 47576, 47536, 47472, 47471, 47470, 47469, 47468, 
47412, 47411, 47410, 47409, 47404, 47403, 47391, 47390, 47389, 47388, 47387, 
47386, 47169, 47168, 41632, 47054, 47221, 47053, 47052]

Failed command: ./support/apply-review.sh -n -r 47471

Error:
2016-05-19 04:13:16 URL:https://reviews.apache.org/r/47471/diff/raw/ 
[5804/5804] -> "47471.patch" [1]
error: patch failed: src/exec/exec.cpp:595
error: src/exec/exec.cpp: patch does not apply
error: patch failed: src/executor/executor.cpp:154
error: src/executor/executor.cpp: patch does not apply
error: patch failed: src/launcher/fetcher.cpp:443
error: src/launcher/fetcher.cpp: patch does not apply

Full log: https://builds.apache.org/job/mesos-reviewbot/13162/console

- Mesos ReviewBot


On May 19, 2016, 4:07 a.m., Alex Clemmer wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/47577/
> ---
> 
> (Updated May 19, 2016, 4:07 a.m.)
> 
> 
> Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
> Remoortere, and Michael Park.
> 
> 
> Repository: mesos
> 
> 
> Description
> ---
> 
> Agent: Added minor changes to various .cpp files to support Windows.
> 
> 
> Diffs
> -
> 
>   src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
>   src/docker/executor.cpp d60addcbe4a1869945ce42f4bb4b1e80e3f29f19 
>   src/files/files.cpp 4e916101b378b0e9032a08a3f6c73e195b2a08a1 
>   src/health-check/main.cpp 98ea5d3675f088e3a341037dcee92695e4857999 
>   src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
>   src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
>   src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
>   src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
>   src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
>   src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 
> 
> Diff: https://reviews.apache.org/r/47577/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Alex Clemmer
> 
>



Review Request 47577: Agent: Added minor changes to various .cpp files to support Windows.

2016-05-18 Thread Alex Clemmer

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/47577/
---

Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van 
Remoortere, and Michael Park.


Repository: mesos


Description
---

Agent: Added minor changes to various .cpp files to support Windows.


Diffs
-

  src/docker/docker.cpp 19cf424dfd5748ae66a7023840aa2b0652e8f2c0 
  src/docker/executor.cpp d60addcbe4a1869945ce42f4bb4b1e80e3f29f19 
  src/files/files.cpp 4e916101b378b0e9032a08a3f6c73e195b2a08a1 
  src/health-check/main.cpp 98ea5d3675f088e3a341037dcee92695e4857999 
  src/logging/logging.cpp 20d2f6341bd39fc5d056f1046d258d006fc602e4 
  src/uri/fetcher.hpp 8af2c9122e0b15fd54f7d3a84779540e7186f566 
  src/uri/fetcher.cpp aa9df5d0256a26b8684934c2bd37b82a069088f7 
  src/uri/fetchers/copy.cpp 2180adfba1f33852d11069eed9d9bca72e2e3b6f 
  src/uri/fetchers/curl.cpp c4420623d718d87776f2eb8e13faf02ef5edb335 
  src/zookeeper/group.cpp 01680899778e554af70b176db82498ca92b51b60 

Diff: https://reviews.apache.org/r/47577/diff/


Testing
---


Thanks,

Alex Clemmer