You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues-all@impala.apache.org by "Tim Armstrong (JIRA)" <ji...@apache.org> on 2018/04/27 20:46:00 UTC
[jira] [Resolved] (IMPALA-6945) IMPALA-6892 doesn't clean pick to
2.x
[ https://issues.apache.org/jira/browse/IMPALA-6945?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Tim Armstrong resolved IMPALA-6945.
-----------------------------------
Resolution: Fixed
Fix Version/s: Impala 2.13.0
> IMPALA-6892 doesn't clean pick to 2.x
> -------------------------------------
>
> Key: IMPALA-6945
> URL: https://issues.apache.org/jira/browse/IMPALA-6945
> Project: IMPALA
> Issue Type: Bug
> Components: Backend
> Affects Versions: Impala 2.13.0
> Reporter: Michael Brown
> Assignee: Tim Armstrong
> Priority: Blocker
> Fix For: Impala 2.13.0
>
>
> {noformat}
> mikeb@mikeb-ub16:1:~/Impala (2.x|CHERRY-PICKING) $ git diff
> diff --cc be/src/exec/exec-node.cc
> index c94f38c,d2dd85f..0000000
> --- a/be/src/exec/exec-node.cc
> +++ b/be/src/exec/exec-node.cc
> @@@ -68,11 -68,6 +68,14 @@@
> using strings::Substitute;
> ++<<<<<<< HEAD
> +DECLARE_int32(be_port);
> +DECLARE_string(hostname);
> +DEFINE_bool_hidden(enable_partitioned_hash_join, true, "Deprecated - has no effect");
> +DEFINE_bool_hidden(enable_partitioned_aggregation, true, "Deprecated - has no effect");
> +
> ++=======
> ++>>>>>>> 518bcd3... IMPALA-6892: CheckHashAndDecrypt() includes file and host
> namespace impala {
> const string ExecNode::ROW_THROUGHPUT_COUNTER = "RowsReturnedRate";
> mikeb@mikeb-ub16:0:~/Impala (2.x|CHERRY-PICKING) $
> {noformat}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-all-unsubscribe@impala.apache.org
For additional commands, e-mail: issues-all-help@impala.apache.org