Repository: ambari Updated Branches: refs/heads/trunk 7cb18c22b -> 63e278dc8
AMBARI-14084. Ambari Views : each view should have separate log file for better troubleshooting (Nitiraj Rathore via pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/63e278dc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/63e278dc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/63e278dc Branch: refs/heads/trunk Commit: 63e278dc8088e16475686e1cb8718a5655687a5e Parents: 7cb18c2 Author: Pallav Kulshreshtha <pallav....@gmail.com> Authored: Tue Apr 5 18:08:06 2016 +0530 Committer: Pallav Kulshreshtha <pallav....@gmail.com> Committed: Tue Apr 5 18:08:06 2016 +0530 ---------------------------------------------------------------------- .../src/main/resources/view.log4j.properties | 11 ----------- .../files/src/main/resources/view.log4j.properties | 11 ----------- .../hive/src/main/resources/view.log4j.properties | 15 --------------- .../jobs/src/main/resources/view.log4j.properties | 11 ----------- .../pig/src/main/resources/view.log4j.properties | 11 ----------- .../slider/src/main/resources/view.log4j.properties | 11 ----------- .../storm/src/main/resources/view.log4j.properties | 11 ----------- .../tez/src/main/resources/view.log4j.properties | 11 ----------- 8 files changed, 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/63e278dc/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties b/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties index 86883a0..32903d3 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties +++ b/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties @@ -1,4 +1,3 @@ -<<<<<<< ours # Copyright 2011 The Apache Software Foundation # # Licensed to the Apache Software Foundation (ASF) under one @@ -10,16 +9,6 @@ # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -======= -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> theirs # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, http://git-wip-us.apache.org/repos/asf/ambari/blob/63e278dc/contrib/views/files/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/files/src/main/resources/view.log4j.properties b/contrib/views/files/src/main/resources/view.log4j.properties index 22abf8e..698947e 100644 --- a/contrib/views/files/src/main/resources/view.log4j.properties +++ b/contrib/views/files/src/main/resources/view.log4j.properties @@ -1,4 +1,3 @@ -<<<<<<< ours # Copyright 2011 The Apache Software Foundation # # Licensed to the Apache Software Foundation (ASF) under one @@ -10,16 +9,6 @@ # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -======= -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> theirs # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, http://git-wip-us.apache.org/repos/asf/ambari/blob/63e278dc/contrib/views/hive/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/hive/src/main/resources/view.log4j.properties b/contrib/views/hive/src/main/resources/view.log4j.properties index f7c8577..16c2d0e 100644 --- a/contrib/views/hive/src/main/resources/view.log4j.properties +++ b/contrib/views/hive/src/main/resources/view.log4j.properties @@ -1,4 +1,3 @@ -<<<<<<< ours # Copyright 2011 The Apache Software Foundation # # Licensed to the Apache Software Foundation (ASF) under one @@ -10,27 +9,13 @@ # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -======= -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> theirs # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -<<<<<<< ours -======= - ->>>>>>> theirs log4j.appender.hiveView=org.apache.log4j.RollingFileAppender log4j.appender.hiveView.File=/var/log/ambari-server/hive-view/hive-view.log log4j.appender.hiveView.MaxFileSize=80MB http://git-wip-us.apache.org/repos/asf/ambari/blob/63e278dc/contrib/views/jobs/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/jobs/src/main/resources/view.log4j.properties b/contrib/views/jobs/src/main/resources/view.log4j.properties index 3862206..86687d6 100644 --- a/contrib/views/jobs/src/main/resources/view.log4j.properties +++ b/contrib/views/jobs/src/main/resources/view.log4j.properties @@ -1,4 +1,3 @@ -<<<<<<< ours # Copyright 2011 The Apache Software Foundation # # Licensed to the Apache Software Foundation (ASF) under one @@ -10,16 +9,6 @@ # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -======= -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> theirs # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, http://git-wip-us.apache.org/repos/asf/ambari/blob/63e278dc/contrib/views/pig/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/view.log4j.properties b/contrib/views/pig/src/main/resources/view.log4j.properties index 02d02d3..5b23a48 100644 --- a/contrib/views/pig/src/main/resources/view.log4j.properties +++ b/contrib/views/pig/src/main/resources/view.log4j.properties @@ -1,4 +1,3 @@ -<<<<<<< ours # Copyright 2011 The Apache Software Foundation # # Licensed to the Apache Software Foundation (ASF) under one @@ -10,16 +9,6 @@ # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -======= -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> theirs # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, http://git-wip-us.apache.org/repos/asf/ambari/blob/63e278dc/contrib/views/slider/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/view.log4j.properties b/contrib/views/slider/src/main/resources/view.log4j.properties index 540b6d1..4737032 100644 --- a/contrib/views/slider/src/main/resources/view.log4j.properties +++ b/contrib/views/slider/src/main/resources/view.log4j.properties @@ -1,4 +1,3 @@ -<<<<<<< ours # Copyright 2011 The Apache Software Foundation # # Licensed to the Apache Software Foundation (ASF) under one @@ -10,16 +9,6 @@ # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -======= -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> theirs # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, http://git-wip-us.apache.org/repos/asf/ambari/blob/63e278dc/contrib/views/storm/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/storm/src/main/resources/view.log4j.properties b/contrib/views/storm/src/main/resources/view.log4j.properties index d17f4cd..309df8d 100644 --- a/contrib/views/storm/src/main/resources/view.log4j.properties +++ b/contrib/views/storm/src/main/resources/view.log4j.properties @@ -1,4 +1,3 @@ -<<<<<<< ours # Copyright 2011 The Apache Software Foundation # # Licensed to the Apache Software Foundation (ASF) under one @@ -10,16 +9,6 @@ # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -======= -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> theirs # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, http://git-wip-us.apache.org/repos/asf/ambari/blob/63e278dc/contrib/views/tez/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/tez/src/main/resources/view.log4j.properties b/contrib/views/tez/src/main/resources/view.log4j.properties index c8e5842..08e00bd 100644 --- a/contrib/views/tez/src/main/resources/view.log4j.properties +++ b/contrib/views/tez/src/main/resources/view.log4j.properties @@ -1,4 +1,3 @@ -<<<<<<< ours # Copyright 2011 The Apache Software Foundation # # Licensed to the Apache Software Foundation (ASF) under one @@ -10,16 +9,6 @@ # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -======= -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 ->>>>>>> theirs # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS,
