You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2017/05/20 02:41:21 UTC

[2/5] httpcomponents-core git commit: Merge branch 'dev/5.0.x/HTTPCORE-468'

Merge branch 'dev/5.0.x/HTTPCORE-468'

[HTTPCORE-468] Allow HttpAsyncService subclasses to customize the HTTP
status code.

Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/28cfcce9
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/28cfcce9
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/28cfcce9

Branch: refs/heads/master
Commit: 28cfcce90ac732b1f6a4d5d7176330c89d628ed3
Parents: 9ec06ec 8374fec
Author: Gary Gregory <gg...@apache.org>
Authored: Thu May 18 16:27:03 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu May 18 16:27:03 2017 -0700

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               |  9 +++++++
 .../hc/core5/http/impl/io/HttpService.java      | 27 ++++++++++++--------
 .../http/impl/nio/ServerHttp1StreamHandler.java | 14 ++++++----
 3 files changed, 34 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/28cfcce9/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE_NOTES.txt
index 7c1c829,7c1c829..6ea30f9
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@@ -1,3 -1,3 +1,12 @@@
++Release 5.0-ALPHA4
++-------------------
++
++Changelog
++-------------------
++
++* HTTPCORE-468: Allow HttpAsyncService subclasses to customize the HTTP status code.
++
++
  Release 5.0-ALPHA3
  -------------------
  


Re: [2/5] httpcomponents-core git commit: Merge branch 'dev/5.0.x/HTTPCORE-468'

Posted by Oleg Kalnichevski <ol...@apache.org>.
On Sat, 2017-05-20 at 02:41 +0000, ggregory@apache.org wrote:
> Merge branch 'dev/5.0.x/HTTPCORE-468'
> 
> [HTTPCORE-468] Allow HttpAsyncService subclasses to customize the
> HTTP
> status code.
> 

Gary

When integrating a single commit from one branch to another please do
try to use cherry-pick instead of merge in order to avoid unnecessary
merge commits.

Oleg

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
For additional commands, e-mail: dev-help@hc.apache.org


Re: [2/5] httpcomponents-core git commit: Merge branch 'dev/5.0.x/HTTPCORE-468'

Posted by Oleg Kalnichevski <ol...@apache.org>.
On Sat, 2017-05-20 at 02:41 +0000, ggregory@apache.org wrote:
> Merge branch 'dev/5.0.x/HTTPCORE-468'
> 
> [HTTPCORE-468] Allow HttpAsyncService subclasses to customize the
> HTTP
> status code.
> 

Gary

When integrating a single commit from one branch to another please do
try to use cherry-pick instead of merge in order to avoid unnecessary
merge commits.

Oleg