You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by Alan Woodward <al...@flax.co.uk> on 2016/03/09 18:53:06 UTC
Re: lucene-solr git commit: SOLR-8765: Set parameters correctly in async shard requests
Hm, this is weird - git appears to be using my apache email address (configured for this particularly repository) as author emails, but then using global settings for the committer address. But, if I run git log --pretty=full locally, then it shows my apache email address for both author and committer lines.
On 9 Mar 2016, at 17:39, romseygeek@apache.org wrote:
> Repository: lucene-solr
> Updated Branches:
> refs/heads/branch_6x 4e911f2d3 -> 6b2f36389
>
>
> SOLR-8765: Set parameters correctly in async shard requests
>
>
> Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
> Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6b2f3638
> Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6b2f3638
> Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6b2f3638
>
> Branch: refs/heads/branch_6x
> Commit: 6b2f3638969e872c704e3d192caec07ad7ef99ed
> Parents: 4e911f2
> Author: Alan Woodward <ro...@apache.org>
> Authored: Wed Mar 9 17:38:07 2016 +0000
> Committer: Alan Woodward <al...@romseysoftware.co.uk>
> Committed: Wed Mar 9 17:39:35 2016 +0000
>
> ----------------------------------------------------------------------
> .../apache/solr/client/solrj/request/CollectionAdminRequest.java | 2 ++
> 1 file changed, 2 insertions(+)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6b2f3638/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
> ----------------------------------------------------------------------
> diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
> index 4f28408..76eb19f 100644
> --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
> +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
> @@ -203,6 +203,8 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
>
> public AsyncShardSpecificAdminRequest(CollectionAction action, String collection, String shard) {
> super(action);
> + this.collection = collection;
> + this.shard = shard;
> }
>
> @Deprecated
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: lucene-solr git commit: SOLR-8765: Set parameters correctly in
async shard requests
Posted by Chris Hostetter <ho...@fucit.org>.
: Hm, this is weird - git appears to be using my apache email address
: (configured for this particularly repository) as author emails, but then
: using global settings for the committer address. But, if I run git log
: --pretty=full locally, then it shows my apache email address for both
: author and committer lines.
that's incredibly bizare.
locally, this is what "git show --pretty=raw 6b2f36389" gives me...
hossman@tray:~/lucene/dev [master] $ git show --pretty=raw 6b2f36389
commit 6b2f3638969e872c704e3d192caec07ad7ef99ed
tree b5415e43f6e1511d80cc3bc53197b00c32ccae24
parent 4e911f2d3a029ae30dad9ea5ffb42530398adcbc
author Alan Woodward <ro...@apache.org> 1457545087 +0000
committer Alan Woodward <al...@romseysoftware.co.uk> 1457545175 +0000
...
...if you're seeing something diff locally, then the only possibilities i
can think of are:L
1) something on the apache side is rewriting the commiter metadata after
you push (which IIUC is not possible)
2) something on your client side is "mapping" the *real* data in the
committer field (alan.woodward@romseysoftware.co.uk) to your apache addr
when displaying to you
what does "git var -l | grep romsey" return on the machine where you did
that commit? (env vars like GIT_COMMITTER_EMAIL override git config
options)
:
:
: On 9 Mar 2016, at 17:39, romseygeek@apache.org wrote:
:
: > Repository: lucene-solr
: > Updated Branches:
: > refs/heads/branch_6x 4e911f2d3 -> 6b2f36389
: >
: >
: > SOLR-8765: Set parameters correctly in async shard requests
: >
: >
: > Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
: > Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6b2f3638
: > Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6b2f3638
: > Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6b2f3638
: >
: > Branch: refs/heads/branch_6x
: > Commit: 6b2f3638969e872c704e3d192caec07ad7ef99ed
: > Parents: 4e911f2
: > Author: Alan Woodward <ro...@apache.org>
: > Authored: Wed Mar 9 17:38:07 2016 +0000
: > Committer: Alan Woodward <al...@romseysoftware.co.uk>
: > Committed: Wed Mar 9 17:39:35 2016 +0000
: >
: > ----------------------------------------------------------------------
: > .../apache/solr/client/solrj/request/CollectionAdminRequest.java | 2 ++
: > 1 file changed, 2 insertions(+)
: > ----------------------------------------------------------------------
: >
: >
: > http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6b2f3638/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
: > ----------------------------------------------------------------------
: > diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
: > index 4f28408..76eb19f 100644
: > --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
: > +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
: > @@ -203,6 +203,8 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
: >
: > public AsyncShardSpecificAdminRequest(CollectionAction action, String collection, String shard) {
: > super(action);
: > + this.collection = collection;
: > + this.shard = shard;
: > }
: >
: > @Deprecated
: >
:
:
: ---------------------------------------------------------------------
: To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
: For additional commands, e-mail: dev-help@lucene.apache.org
:
:
-Hoss
http://www.lucidworks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org