[jira] [Commented] (HTTPCLIENT-1460) Cached files would be deleted after CloseableHttpClient being closed.

2017-05-24 Thread Eric Jain (JIRA)

[ 
https://issues.apache.org/jira/browse/HTTPCLIENT-1460?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16023893#comment-16023893
 ] 

Eric Jain commented on HTTPCLIENT-1460:
---

There's no point in not deleting the FileResources when closing, when the 
HttpCacheEntries are not persisted as well...

> Cached files would be deleted after CloseableHttpClient being closed.
> -
>
> Key: HTTPCLIENT-1460
> URL: https://issues.apache.org/jira/browse/HTTPCLIENT-1460
> Project: HttpComponents HttpClient
>  Issue Type: Bug
>  Components: HttpCache
>Affects Versions: 4.3.2
>Reporter: Yang Bo
> Fix For: 4.4 Alpha1
>
>
> I created a `CloseableHttpClient` from `CachingHttpClientBuilder`. I assigned 
> a directory for the `CloseableHttpClient`'s cacheDir.
> The `CloseableHttpClient` worked well for processing requests with cache. But 
> after `CloseableHttpClient.close()` invoked, all cached files were deleted. 
> Therefore, new `CloseableHttpClient` in new JVM cannot reuse original cache. 
> This behavior is different from browsers or JDK's http clients.



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

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



[GitHub] httpcomponents-client pull request #79: Avoid fetching entity from cache's d...

2017-05-24 Thread pono
Github user pono closed the pull request at:

https://github.com/apache/httpcomponents-client/pull/79


---
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, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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



Re: [VOTE] Git Guidelines (2)

2017-05-24 Thread Oleg Kalnichevski
[x] +1 Committers must abide to these Git guidelines while working on the code

On May 24, 2017 7:11:27 PM GMT+02:00, Michael Osipov  
wrote:
>Hi folks,
>
>I am re-casting this vote for the previously discussed Git guidelines 
>for all committers to make life easier for everyone. If the vote
>passes, 
>every committer must abide to this.
>
>The guidelines:
>= Typical Issue Workflow =
>
>  1. Branch off a release branch (e.g., 4.4.x, 5.0.x) ({{{git checkout 
>-b / master}}}) where {{{}}} being
>the 
>JIRA issue you have assigned to yourself, e.g., HTTPCORE-123 or 
>HTTPCLIENT-689. Exmaple: {{{git checkout -b 4.4.x/HTTPCORE-123
>4.4.x}}}.
>  1. Work on your issue and create as many commits as you want/need
>  1. Polish it, squash it or fix it up into a single commit
>  1. Ask for a review if you are uncertain
>  1. Take care of a proper commit message (good reads: 
>[[https://chris.beams.io/posts/git-commit/|1]] and 
>[[https://github.com/erlang/otp/wiki/Writing-good-commit-messages|2]]):
>
>Put the title of the JIRA issue, e.g., [HTTPCORE-123] Memory leak in 
>response, in the first line, followed by an explanation why you did
>take 
>this approach. The ticket desc contains the issue, your commit message 
>contains the solution. If in doubt, ask for help and give people a 
>couple of days to react.
>1. Request the release manager to merge your banch back to the release 
>branch and make sure that this merge won't incur a merge commit
>  1. When you close the issue, put a link to your commit to create a 
>direct relation between issue and solution.
>
>=  Side Notes =
>
>  1. Never rewrite (rebase) history on master or any other long-lived 
>branch because you will break others. Only the release manager is 
>entitled to clean up history upto 72 hours after a commit if it is 
>absolutely necessary
>  1. If a change comes for a PR on GitHub:
>* Apply the same above rules
>* Don't steal authorship
>* Let the reporter polish his work
>  * Amend the message at the end with "This closes/fixes #xy" and push.
>
>
>Link: https://wiki.apache.org/HttpComponents/GitGuidelines
>
>Vote is open until 2017-05-29 00:00 Etc/UTC.
>
>[ ] +1 Committers must abide to these Git guidelines while working on 
>the code
>[ ] -1 I do not agree with this guideline
>
>We need at least three binding votes from HC members.
>
>Michael
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org
>For additional commands, e-mail: dev-h...@hc.apache.org
>
>
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org
>For additional commands, e-mail: dev-h...@hc.apache.org


-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

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



Re: [VOTE] Git Guidelines (2)

2017-05-24 Thread Michael Osipov

Am 2017-05-24 um 19:11 schrieb Michael Osipov:

Hi folks,

I am re-casting this vote for the previously discussed Git guidelines
for all committers to make life easier for everyone. If the vote passes,
every committer must abide to this.

The guidelines:
= Typical Issue Workflow =

 1. Branch off a release branch (e.g., 4.4.x, 5.0.x) ({{{git checkout -b
/ master}}}) where {{{}}} being the
JIRA issue you have assigned to yourself, e.g., HTTPCORE-123 or
HTTPCLIENT-689. Exmaple: {{{git checkout -b 4.4.x/HTTPCORE-123 4.4.x}}}.
 1. Work on your issue and create as many commits as you want/need
 1. Polish it, squash it or fix it up into a single commit
 1. Ask for a review if you are uncertain
 1. Take care of a proper commit message (good reads:
[[https://chris.beams.io/posts/git-commit/|1]] and
[[https://github.com/erlang/otp/wiki/Writing-good-commit-messages|2]]):
Put the title of the JIRA issue, e.g., [HTTPCORE-123] Memory leak in
response, in the first line, followed by an explanation why you did take
this approach. The ticket desc contains the issue, your commit message
contains the solution. If in doubt, ask for help and give people a
couple of days to react.
 1. Request the release manager to merge your banch back to the release
branch and make sure that this merge won't incur a merge commit
 1. When you close the issue, put a link to your commit to create a
direct relation between issue and solution.

=  Side Notes =

 1. Never rewrite (rebase) history on master or any other long-lived
branch because you will break others. Only the release manager is
entitled to clean up history upto 72 hours after a commit if it is
absolutely necessary
 1. If a change comes for a PR on GitHub:
   * Apply the same above rules
   * Don't steal authorship
   * Let the reporter polish his work
   * Amend the message at the end with "This closes/fixes #xy" and push.


Link: https://wiki.apache.org/HttpComponents/GitGuidelines

Vote is open until 2017-05-29 00:00 Etc/UTC.

[ ] +1 Committers must abide to these Git guidelines while working on
the code
[ ] -1 I do not agree with this guideline


+1 from me for a clean workflow and history...


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



[VOTE] Git Guidelines (2)

2017-05-24 Thread Michael Osipov

Hi folks,

I am re-casting this vote for the previously discussed Git guidelines 
for all committers to make life easier for everyone. If the vote passes, 
every committer must abide to this.


The guidelines:
= Typical Issue Workflow =

 1. Branch off a release branch (e.g., 4.4.x, 5.0.x) ({{{git checkout 
-b / master}}}) where {{{}}} being the 
JIRA issue you have assigned to yourself, e.g., HTTPCORE-123 or 
HTTPCLIENT-689. Exmaple: {{{git checkout -b 4.4.x/HTTPCORE-123 4.4.x}}}.

 1. Work on your issue and create as many commits as you want/need
 1. Polish it, squash it or fix it up into a single commit
 1. Ask for a review if you are uncertain
 1. Take care of a proper commit message (good reads: 
[[https://chris.beams.io/posts/git-commit/|1]] and 
[[https://github.com/erlang/otp/wiki/Writing-good-commit-messages|2]]): 
Put the title of the JIRA issue, e.g., [HTTPCORE-123] Memory leak in 
response, in the first line, followed by an explanation why you did take 
this approach. The ticket desc contains the issue, your commit message 
contains the solution. If in doubt, ask for help and give people a 
couple of days to react.
 1. Request the release manager to merge your banch back to the release 
branch and make sure that this merge won't incur a merge commit
 1. When you close the issue, put a link to your commit to create a 
direct relation between issue and solution.


=  Side Notes =

 1. Never rewrite (rebase) history on master or any other long-lived 
branch because you will break others. Only the release manager is 
entitled to clean up history upto 72 hours after a commit if it is 
absolutely necessary

 1. If a change comes for a PR on GitHub:
   * Apply the same above rules
   * Don't steal authorship
   * Let the reporter polish his work
   * Amend the message at the end with "This closes/fixes #xy" and push.


Link: https://wiki.apache.org/HttpComponents/GitGuidelines

Vote is open until 2017-05-29 00:00 Etc/UTC.

[ ] +1 Committers must abide to these Git guidelines while working on 
the code

[ ] -1 I do not agree with this guideline

We need at least three binding votes from HC members.

Michael

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



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



Re: Git merges

2017-05-24 Thread Michael Osipov

Am 2017-05-24 um 18:55 schrieb Oleg Kalnichevski:

.


Michael,

Is there anything holding back the vote?


Not from my side. I did cast it (see [VOTE] Git Guidelines), but didn't

receive no official votes. I will extend the period.

Don't forget to cast your vote!

Michael


The subject of the vote has changed, has not it? You need to start a new vote 
with the exact subject we are supposed to vote on.


You are right. Completely forgot that we changed the rewrite permission 
within 72 hours. Will recast.


Michael


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



Re: [VOTE] Git Guidelines

2017-05-24 Thread Michael Osipov

Am 2017-05-21 um 11:00 schrieb Michael Osipov:

Hi folks,

I am casting this vote for the previously discussed Git guidelines for
all committers to make life easier for everyone. If the vote passes,
every committer must abide to this.

The guidelines:
= Typical Issue Workflow =

 1. Branch off a release branch (e.g., 4.4.x, 5.0.x) ({{{git checkout -b
/ master}}}) where {{{}}} being the
JIRA issue you have assigned to yourself, e.g., HTTPCORE-123 or
HTTPCLIENT-689. Exmaple: {{{git checkout -b 4.4.x/HTTPCORE-123 4.4.x}}}.
 1. Work on your issue and create as many commits as you want/need
 1. Polish it, squash it or fix it up into a single commit
 1. Ask for a review if you are uncertain
 1. Take care of a proper commit message (good reads:
[[https://chris.beams.io/posts/git-commit/|1]] and
[[https://github.com/erlang/otp/wiki/Writing-good-commit-messages|2]]):
Put the title of the JIRA issue, e.g., [HTTPCORE-123] Memory leak in
response, in the first line, followed by an explanation why you did take
this approach. The ticket desc contains the issue, your commit message
contains the solution. If in doubt, ask for help and give people a
couple of days to react.
 1. Request the release manager to merge your banch back to the release
branch and make sure that this merge won't incur a merge commit
 1. When you close the issue, put a link to your commit to create a
direct relation between issue and solution.

=  Side Notes =

 1. Never rewrite (rebase) history on master or any other long-lived
branch because you will break others. Only the release manager is
entitled to clean up history right before a release if it is absolutely
necessary
 1. If a change comes for a PR on GitHub:
   * Apply the same above rules
   * Don't steal authorship
   * Let the reporter polish his work
   * Amend the message at the end with "This closes/fixes #xy" and push.

Link: https://wiki.apache.org/HttpComponents/GitGuidelines

Vote is open until 2017-05-25 00:00 Etc/UTC.

[ ] +1 Committers must abide to these Git guidelines while working on
the code
[ ] -1 I do not agree with this guideline

We need at least three binding votes from HC members.


Vote has been cancelled due to changed side notes on history rewrite.


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



Re: Git merges

2017-05-24 Thread Oleg Kalnichevski
.
>>
>> Michael,
>>
>> Is there anything holding back the vote?
>
>Not from my side. I did cast it (see [VOTE] Git Guidelines), but didn't
>
>receive no official votes. I will extend the period.
>
>Don't forget to cast your vote!
>
>Michael

The subject of the vote has changed, has not it? You need to start a new vote 
with the exact subject we are supposed to vote on.

Oleg
-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

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



Re: [VOTE] Git Guidelines

2017-05-24 Thread Michael Osipov

Am 2017-05-22 um 06:46 schrieb Gary Gregory:

I will follow whatever the community decides; my only request is that
precise git instructions be provided for contributors and RMs. I'm sure
Oleg does not need them, but I'd like to get releases sooner perhaps so I
might give RMing a go if there a bug fix I just must have ASAP.


Do you intend to abstain from your vote? Or is this an indirect +1?

Michael


On May 21, 2017 2:00 AM, "Michael Osipov"  wrote:


Hi folks,

I am casting this vote for the previously discussed Git guidelines for all
committers to make life easier for everyone. If the vote passes, every
committer must abide to this.

The guidelines:
= Typical Issue Workflow =

 1. Branch off a release branch (e.g., 4.4.x, 5.0.x) ({{{git checkout -b
/ master}}}) where {{{}}} being the JIRA
issue you have assigned to yourself, e.g., HTTPCORE-123 or HTTPCLIENT-689.
Exmaple: {{{git checkout -b 4.4.x/HTTPCORE-123 4.4.x}}}.
 1. Work on your issue and create as many commits as you want/need
 1. Polish it, squash it or fix it up into a single commit
 1. Ask for a review if you are uncertain
 1. Take care of a proper commit message (good reads: [[
https://chris.beams.io/posts/git-commit/|1]] and [[
https://github.com/erlang/otp/wiki/Writing-good-commit-messages|2]]): Put
the title of the JIRA issue, e.g., [HTTPCORE-123] Memory leak in response,
in the first line, followed by an explanation why you did take this
approach. The ticket desc contains the issue, your commit message contains
the solution. If in doubt, ask for help and give people a couple of days to
react.
 1. Request the release manager to merge your banch back to the release
branch and make sure that this merge won't incur a merge commit
 1. When you close the issue, put a link to your commit to create a direct
relation between issue and solution.

=  Side Notes =

 1. Never rewrite (rebase) history on master or any other long-lived
branch because you will break others. Only the release manager is entitled
to clean up history right before a release if it is absolutely necessary
 1. If a change comes for a PR on GitHub:
   * Apply the same above rules
   * Don't steal authorship
   * Let the reporter polish his work
   * Amend the message at the end with "This closes/fixes #xy" and push.

Link: https://wiki.apache.org/HttpComponents/GitGuidelines

Vote is open until 2017-05-25 00:00 Etc/UTC.

[ ] +1 Committers must abide to these Git guidelines while working on the
code
[ ] -1 I do not agree with this guideline

We need at least three binding votes from HC members.

Michael

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







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



Re: Git merges

2017-05-24 Thread Michael Osipov

Am 2017-05-24 um 13:49 schrieb Oleg Kalnichevski:

On Wed, 2017-05-24 at 11:51 +0200, Michael Osipov wrote:

Hi Oleg,

I'm sure we need no noise at all but I could not figure out how to
clean it
up.

I do know that got one cherry-picked commit right for one of the
tickets.

For the other, I could not get rid of the merge commits.


If you can't merge properly, please ask for help before merging to
upstream.
You produce merge commits because your branch has not been rebased on
top of
master.



Gary

Based on Michael's proposal merging dev branches to release branches
becomes RM's (my) job. Stop worrying about merges for now and worry
more about building things in dev branches.

Michael,

Is there anything holding back the vote?


Not from my side. I did cast it (see [VOTE] Git Guidelines), but didn't 
receive no official votes. I will extend the period.


Don't forget to cast your vote!

Michael


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



Re: Re: Git merges

2017-05-24 Thread Oleg Kalnichevski
On Wed, 2017-05-24 at 11:51 +0200, Michael Osipov wrote:
> > Hi Oleg,
> > 
> > I'm sure we need no noise at all but I could not figure out how to
> > clean it
> > up.
> > 
> > I do know that got one cherry-picked commit right for one of the
> > tickets.
> > 
> > For the other, I could not get rid of the merge commits.
> 
> If you can't merge properly, please ask for help before merging to
> upstream.
> You produce merge commits because your branch has not been rebased on
> top of
> master.
> 

Gary

Based on Michael's proposal merging dev branches to release branches
becomes RM's (my) job. Stop worrying about merges for now and worry
more about building things in dev branches. 

Michael,

Is there anything holding back the vote?

Oleg  


> > On Wed, May 24, 2017 at 1:37 AM, Oleg Kalnichevski
> >  wrote:
> > 
> > > Gary
> > > 
> > > You latest commits to the repo produced the following history:
> > > 
> > > ---
> > > d0b0cfab3 HTTPCORE-471: Add APIs URIBuilder.localhost() and
> > > setHost(InetAddress)
> > > c30d60875 Merge branch 'master' of https://git-wip-us.apache.org/
> > > repos/
> > > asf/httpcomponents-core.git
> > > 907d67637 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost()
> > > loopbackAddress() and setHost(InetAddress).
> > > 257b251b3 Fix typos in examples.
> > > 69863fd56 [HTTPCORE-468]
> > > 173d8422e Merge branch 'master' of https://git-wip-us.apache.org/
> > > repos/
> > > asf/httpcomponents-core.git
> > > 47c02ac66 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost()
> > > loopbackAddress() and setHost(InetAddress).
> > > 33d26c3c2 Fix typos in examples.
> > > c96d1adab [HTTPCORE-468]
> > > 4195288ed Fix typos in examples.
> > > 28cfcce90 Merge branch 'dev/5.0.x/HTTPCORE-468'
> > > 8374fec65 [HTTPCORE-468]
> > > 9ec06ec64 Line ending normalization
> > > ---
> > > 
> > > The same stuff got merged in multiple times from multiple
> > > branches.
> > > 
> > > Do we really need all this noise?
> > > 
> > > I reorganized the same commits with zero diff (no functional
> > > changes)
> > > producing the following history:
> > > 
> > > ---
> > > 7d518b5f6 HTTPCORE-471: Add APIs URIBuilder.localhost() and
> > > setHost(InetAddress)
> > > bf8d50fcc Fix typos in examples.
> > > c8a110db0 [HTTPCORE-468]
> > > 9ec06ec64 Line ending normalization
> > > ---
> > > 
> > > Please have a look. Again, do we really need all this noise?
> > > 
> > > Oleg
> > > 
> > > 
> > > ---
> > > --
> > > To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org
> > > For additional commands, e-mail: dev-h...@hc.apache.org
> > > 
> > > 
> > 
> > 
> > -- 
> > E-Mail: garydgreg...@gmail.com | ggreg...@apache.org
> > Java Persistence with Hibernate, Second Edition
> >  > camp=1789=9325=1617290459=as2=ga
> > rygregory-20=cadb800f39946ec62ea2b1af9fe6a2b8>
> > 
> >  > 20=am2=1=1617290459>
> > JUnit in Action, Second Edition
> >  > camp=1789=9325=1935182021=as2=ga
> > rygregory-20=31ecd1f6b6d1eaf8886ac902a24de418%22>
> > 
> >  > 20=am2=1=1935182021>
> > Spring Batch in Action
> >  > camp=1789=9325=1935182951=%7B%7Blink
> > Code%7D%7D=garygregory-
> > 20=%7B%7Blink_id%7D%7D%22%3ESpring+Batch+in+Action>
> >  > 20=am2=1=1935182951>
> > Blog: http://garygregory.wordpress.com
> > Home: http://garygregory.com/
> > Tweet! http://twitter.com/GaryGregory
> > 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org
> For additional commands, e-mail: dev-h...@hc.apache.org
> 

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



Re: Re: Git merges

2017-05-24 Thread Michael Osipov


> Hi Oleg,
> 
> I'm sure we need no noise at all but I could not figure out how to clean it
> up.
> 
> I do know that got one cherry-picked commit right for one of the tickets.
> 
> For the other, I could not get rid of the merge commits.

If you can't merge properly, please ask for help before merging to upstream.
You produce merge commits because your branch has not been rebased on top of
master.

> On Wed, May 24, 2017 at 1:37 AM, Oleg Kalnichevski  wrote:
> 
> > Gary
> >
> > You latest commits to the repo produced the following history:
> >
> > ---
> > d0b0cfab3 HTTPCORE-471: Add APIs URIBuilder.localhost() and
> > setHost(InetAddress)
> > c30d60875 Merge branch 'master' of https://git-wip-us.apache.org/repos/
> > asf/httpcomponents-core.git
> > 907d67637 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost()
> > loopbackAddress() and setHost(InetAddress).
> > 257b251b3 Fix typos in examples.
> > 69863fd56 [HTTPCORE-468]
> > 173d8422e Merge branch 'master' of https://git-wip-us.apache.org/repos/
> > asf/httpcomponents-core.git
> > 47c02ac66 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost()
> > loopbackAddress() and setHost(InetAddress).
> > 33d26c3c2 Fix typos in examples.
> > c96d1adab [HTTPCORE-468]
> > 4195288ed Fix typos in examples.
> > 28cfcce90 Merge branch 'dev/5.0.x/HTTPCORE-468'
> > 8374fec65 [HTTPCORE-468]
> > 9ec06ec64 Line ending normalization
> > ---
> >
> > The same stuff got merged in multiple times from multiple branches.
> >
> > Do we really need all this noise?
> >
> > I reorganized the same commits with zero diff (no functional changes)
> > producing the following history:
> >
> > ---
> > 7d518b5f6 HTTPCORE-471: Add APIs URIBuilder.localhost() and
> > setHost(InetAddress)
> > bf8d50fcc Fix typos in examples.
> > c8a110db0 [HTTPCORE-468]
> > 9ec06ec64 Line ending normalization
> > ---
> >
> > Please have a look. Again, do we really need all this noise?
> >
> > Oleg
> >
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org
> > For additional commands, e-mail: dev-h...@hc.apache.org
> >
> >
> 
> 
> -- 
> E-Mail: garydgreg...@gmail.com | ggreg...@apache.org
> Java Persistence with Hibernate, Second Edition
> 
> 
> 
> JUnit in Action, Second Edition
> 
> 
> 
> Spring Batch in Action
> 
> 
> Blog: http://garygregory.wordpress.com
> Home: http://garygregory.com/
> Tweet! http://twitter.com/GaryGregory
> 

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



Re: Git merges

2017-05-24 Thread Gary Gregory
Hi Oleg,

I'm sure we need no noise at all but I could not figure out how to clean it
up.

I do know that got one cherry-picked commit right for one of the tickets.

For the other, I could not get rid of the merge commits.

Gary

On Wed, May 24, 2017 at 1:37 AM, Oleg Kalnichevski  wrote:

> Gary
>
> You latest commits to the repo produced the following history:
>
> ---
> d0b0cfab3 HTTPCORE-471: Add APIs URIBuilder.localhost() and
> setHost(InetAddress)
> c30d60875 Merge branch 'master' of https://git-wip-us.apache.org/repos/
> asf/httpcomponents-core.git
> 907d67637 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost()
> loopbackAddress() and setHost(InetAddress).
> 257b251b3 Fix typos in examples.
> 69863fd56 [HTTPCORE-468]
> 173d8422e Merge branch 'master' of https://git-wip-us.apache.org/repos/
> asf/httpcomponents-core.git
> 47c02ac66 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost()
> loopbackAddress() and setHost(InetAddress).
> 33d26c3c2 Fix typos in examples.
> c96d1adab [HTTPCORE-468]
> 4195288ed Fix typos in examples.
> 28cfcce90 Merge branch 'dev/5.0.x/HTTPCORE-468'
> 8374fec65 [HTTPCORE-468]
> 9ec06ec64 Line ending normalization
> ---
>
> The same stuff got merged in multiple times from multiple branches.
>
> Do we really need all this noise?
>
> I reorganized the same commits with zero diff (no functional changes)
> producing the following history:
>
> ---
> 7d518b5f6 HTTPCORE-471: Add APIs URIBuilder.localhost() and
> setHost(InetAddress)
> bf8d50fcc Fix typos in examples.
> c8a110db0 [HTTPCORE-468]
> 9ec06ec64 Line ending normalization
> ---
>
> Please have a look. Again, do we really need all this noise?
>
> Oleg
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org
> For additional commands, e-mail: dev-h...@hc.apache.org
>
>


-- 
E-Mail: garydgreg...@gmail.com | ggreg...@apache.org
Java Persistence with Hibernate, Second Edition



JUnit in Action, Second Edition



Spring Batch in Action


Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory


Git merges

2017-05-24 Thread Oleg Kalnichevski
Gary

You latest commits to the repo produced the following history:

---
d0b0cfab3 HTTPCORE-471: Add APIs URIBuilder.localhost() and
setHost(InetAddress)
c30d60875 Merge branch 'master' of https://git-wip-us.apache.org/repos/
asf/httpcomponents-core.git
907d67637 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost()
loopbackAddress() and setHost(InetAddress).
257b251b3 Fix typos in examples.
69863fd56 [HTTPCORE-468]
173d8422e Merge branch 'master' of https://git-wip-us.apache.org/repos/
asf/httpcomponents-core.git
47c02ac66 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost()
loopbackAddress() and setHost(InetAddress).
33d26c3c2 Fix typos in examples.
c96d1adab [HTTPCORE-468]
4195288ed Fix typos in examples.
28cfcce90 Merge branch 'dev/5.0.x/HTTPCORE-468'
8374fec65 [HTTPCORE-468]
9ec06ec64 Line ending normalization
---

The same stuff got merged in multiple times from multiple branches. 

Do we really need all this noise?

I reorganized the same commits with zero diff (no functional changes)
producing the following history: 

---
7d518b5f6 HTTPCORE-471: Add APIs URIBuilder.localhost() and
setHost(InetAddress)
bf8d50fcc Fix typos in examples.
c8a110db0 [HTTPCORE-468]
9ec06ec64 Line ending normalization
---

Please have a look. Again, do we really need all this noise? 

Oleg


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



[jira] [Resolved] (HTTPCORE-471) Add APIs URIBuilder.localhost() and setHost(InetAddress)

2017-05-24 Thread Gary Gregory (JIRA)

 [ 
https://issues.apache.org/jira/browse/HTTPCORE-471?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Gary Gregory resolved HTTPCORE-471.
---
Resolution: Fixed

> Add APIs URIBuilder.localhost() and setHost(InetAddress)
> 
>
> Key: HTTPCORE-471
> URL: https://issues.apache.org/jira/browse/HTTPCORE-471
> Project: HttpComponents HttpCore
>  Issue Type: New Feature
>Reporter: Gary Gregory
>Assignee: Gary Gregory
> Fix For: 5.0-alpha4
>
>
> Add APIs URIBuilder.localhost() and setHost(InetAddress)



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

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



[jira] [Moved] (HTTPCORE-471) Add APIs URIBuilder.localhost() and setHost(InetAddress)

2017-05-24 Thread Gary Gregory (JIRA)

 [ 
https://issues.apache.org/jira/browse/HTTPCORE-471?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Gary Gregory moved HTTPCLIENT-1853 to HTTPCORE-471:
---

Fix Version/s: (was: 4.6 Alpha1)
   5.0-alpha4
  Component/s: (was: HttpClient (classic))
 Workflow: classic default workflow  (was: Default workflow, editable 
Closed status)
  Key: HTTPCORE-471  (was: HTTPCLIENT-1853)
  Project: HttpComponents HttpCore  (was: HttpComponents HttpClient)

> Add APIs URIBuilder.localhost() and setHost(InetAddress)
> 
>
> Key: HTTPCORE-471
> URL: https://issues.apache.org/jira/browse/HTTPCORE-471
> Project: HttpComponents HttpCore
>  Issue Type: New Feature
>Reporter: Gary Gregory
>Assignee: Gary Gregory
> Fix For: 5.0-alpha4
>
>
> Add APIs URIBuilder.localhost() and setHost(InetAddress)



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

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



[jira] [Updated] (HTTPCLIENT-1852) Add APIs URIBuilder.localhost() and setHost(InetAddress)

2017-05-24 Thread Gary Gregory (JIRA)

 [ 
https://issues.apache.org/jira/browse/HTTPCLIENT-1852?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Gary Gregory updated HTTPCLIENT-1852:
-
Fix Version/s: (was: 5.0 Alpha3)

> Add APIs URIBuilder.localhost() and setHost(InetAddress)
> 
>
> Key: HTTPCLIENT-1852
> URL: https://issues.apache.org/jira/browse/HTTPCLIENT-1852
> Project: HttpComponents HttpClient
>  Issue Type: New Feature
>  Components: HttpClient (classic)
>Reporter: Gary Gregory
>Assignee: Gary Gregory
> Fix For: 4.6 Alpha1
>
>
> Add APIs URIBuilder.localhost() and setHost(InetAddress)



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

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



[jira] [Created] (HTTPCLIENT-1853) Add APIs URIBuilder.localhost() and setHost(InetAddress)

2017-05-24 Thread Gary Gregory (JIRA)
Gary Gregory created HTTPCLIENT-1853:


 Summary: Add APIs URIBuilder.localhost() and setHost(InetAddress)
 Key: HTTPCLIENT-1853
 URL: https://issues.apache.org/jira/browse/HTTPCLIENT-1853
 Project: HttpComponents HttpClient
  Issue Type: New Feature
  Components: HttpClient (classic)
Reporter: Gary Gregory
Assignee: Gary Gregory
 Fix For: 4.6 Alpha1


Add APIs URIBuilder.localhost() and setHost(InetAddress)



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

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



[jira] [Resolved] (HTTPCORE-470) Add a org.apache.http.nio.protocol.NullRequestHandler singleton

2017-05-24 Thread Gary Gregory (JIRA)

 [ 
https://issues.apache.org/jira/browse/HTTPCORE-470?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Gary Gregory resolved HTTPCORE-470.
---
Resolution: Fixed

Cherry picked commit {{d3901eb9a0928f023a147fdd4cf801881e219d4d}} from branch 
{{dev/4.4.x/HTTPCORE-470}} and committed 
{{c09d08b6683039000454d187d071e3b7cd11b43c}}.

> Add a org.apache.http.nio.protocol.NullRequestHandler singleton
> ---
>
> Key: HTTPCORE-470
> URL: https://issues.apache.org/jira/browse/HTTPCORE-470
> Project: HttpComponents HttpCore
>  Issue Type: Improvement
>Reporter: Gary Gregory
>Assignee: Gary Gregory
> Fix For: 4.4.7
>
>
> Add a org.apache.http.nio.protocol.NullRequestHandler singleton.



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

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



[jira] [Commented] (HTTPCORE-470) Add a org.apache.http.nio.protocol.NullRequestHandler singleton

2017-05-24 Thread Gary Gregory (JIRA)

[ 
https://issues.apache.org/jira/browse/HTTPCORE-470?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16022423#comment-16022423
 ] 

Gary Gregory commented on HTTPCORE-470:
---

No more feedback. I will merge.

> Add a org.apache.http.nio.protocol.NullRequestHandler singleton
> ---
>
> Key: HTTPCORE-470
> URL: https://issues.apache.org/jira/browse/HTTPCORE-470
> Project: HttpComponents HttpCore
>  Issue Type: Improvement
>Reporter: Gary Gregory
>Assignee: Gary Gregory
> Fix For: 4.4.7
>
>
> Add a org.apache.http.nio.protocol.NullRequestHandler singleton.



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

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