[
https://issues.apache.org/jira/browse/AMBARI-8269?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14207238#comment-14207238
]
Yusaku Sako commented on AMBARI-8269:
-------------------------------------
I could not apply AMBARI-8269.2.patch on top of latest trunk
(0f33f71b636f5a1849b3b425ef9ea7547fd19011):
MacBook-Pro:ambari yusakusako$ patch -p1 < AMBARI-8269.2.patch
patching file ambari-admin/pom.xml
patching file ambari-agent/conf/windows/ambari-agent.cmd
patching file ambari-agent/conf/windows/ambari-agent.ini
patching file ambari-agent/conf/windows/ambari-agent.ps1
patching file ambari-agent/conf/windows/ambari-env.cmd
patching file ambari-agent/conf/windows/createservice.ps1
patching file ambari-agent/conf/windows/service_wrapper.py
patching file ambari-agent/pom.xml
patching file ambari-agent/src/main/package/msi/ambari-agent.wxs
patching file ambari-agent/src/main/python/ambari_agent/ActionQueue.py
patching file ambari-agent/src/main/python/ambari_agent/AgentConfig_linux.py
patching file ambari-agent/src/main/python/ambari_agent/AgentConfig_windows.py
patching file ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py
patching file ambari-agent/src/main/python/ambari_agent/AmbariAgent.py
patching file ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
patching file ambari-agent/src/main/python/ambari_agent/Controller.py
patching file
ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
patching file ambari-agent/src/main/python/ambari_agent/Facter.py
patching file ambari-agent/src/main/python/ambari_agent/FileCache.py
patching file ambari-agent/src/main/python/ambari_agent/Hardware.py
patching file
ambari-agent/src/main/python/ambari_agent/HeartbeatHandlers_windows.py
patching file
ambari-agent/src/main/python/ambari_agent/HeartbeatStopHandler_linux.py
patching file
ambari-agent/src/main/python/ambari_agent/HostCheckReportFileHandler.py
patching file ambari-agent/src/main/python/ambari_agent/HostInfo.py
patching file ambari-agent/src/main/python/ambari_agent/HostInfo_linux.py
patching file ambari-agent/src/main/python/ambari_agent/HostInfo_win.py
patching file ambari-agent/src/main/python/ambari_agent/NetUtil.py
patching file ambari-agent/src/main/python/ambari_agent/PackagesAnalyzer.py
patching file ambari-agent/src/main/python/ambari_agent/PythonExecutor.py
patching file ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
patching file ambari-agent/src/main/python/ambari_agent/alerts/port_alert.py
patching file ambari-agent/src/main/python/ambari_agent/alerts/script_alert.py
patching file ambari-agent/src/main/python/ambari_agent/apscheduler/job.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/__init__.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/mongodb_store.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/ram_store.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/redis_store.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/shelve_store.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/sqlalchemy_store.py
patching file ambari-agent/src/main/python/ambari_agent/apscheduler/scheduler.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/__init__.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/cron/__init__.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/cron/expressions.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/cron/fields.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/interval.py
patching file
ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/simple.py
patching file ambari-agent/src/main/python/ambari_agent/hostname.py
patching file ambari-agent/src/main/python/ambari_agent/main.py
patching file ambari-agent/src/main/python/ambari_agent/security.py
patching file ambari-agent/src/main/python/ambari_agent/shell.py
patching file ambari-agent/src/main/python/setup.py
patching file ambari-agent/src/packages/windows.xml
patching file ambari-agent/src/test/python/ambari_agent/TestAlerts.py
patching file ambari-agent/src/test/python/ambari_agent/TestCertGeneration.py
patching file ambari-agent/src/test/python/ambari_agent/TestController.py
patching file
ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
patching file ambari-agent/src/test/python/ambari_agent/TestHostname.py
patching file ambari-agent/src/test/python/ambari_agent/TestMain.py
patching file ambari-agent/src/test/python/ambari_agent/TestNetUtil.py
patching file
ambari-agent/src/test/python/resource_management/TestContentSources.py
patching file
ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
patching file
ambari-agent/src/test/python/resource_management/TestExecuteHadoopResource.py
patching file
ambari-agent/src/test/python/resource_management/TestExecuteResource.py
patching file
ambari-agent/src/test/python/resource_management/TestMonitorWebserverResource.py
patching file
ambari-agent/src/test/python/resource_management/TestSubstituteVars.py
patching file ambari-agent/src/test/python/unitTests.py
patching file ambari-client/groovy-client/pom.xml
patching file ambari-client/python-client/pom.xml
patching file ambari-common/src/main/python/ambari_commons/ambari_service.py
patching file ambari-common/src/main/python/ambari_commons/exceptions.py
patching file ambari-common/src/main/python/ambari_commons/inet_utils.py
patching file ambari-common/src/main/python/ambari_commons/logging_utils.py
patching file ambari-common/src/main/python/ambari_commons/os_check.py
patching file ambari-common/src/main/python/ambari_commons/os_linux.py
patching file ambari-common/src/main/python/ambari_commons/os_utils.py
patching file ambari-common/src/main/python/ambari_commons/os_windows.py
patching file
ambari-common/src/main/python/ambari_commons/resources/os_family.json
patching file ambari-common/src/main/python/ambari_commons/str_utils.py
patching file ambari-common/src/main/python/resource_management/core/logger.py
patching file
ambari-common/src/main/python/resource_management/core/providers/__init__.py
patching file
ambari-common/src/main/python/resource_management/core/providers/windows/__init__.py
patching file
ambari-common/src/main/python/resource_management/core/providers/windows/service.py
patching file
ambari-common/src/main/python/resource_management/core/providers/windows/system.py
patching file
ambari-common/src/main/python/resource_management/libraries/functions/__init__.py
patching file
ambari-common/src/main/python/resource_management/libraries/functions/default.py
patching file
ambari-common/src/main/python/resource_management/libraries/functions/get_unique_id_and_date.py
patching file
ambari-common/src/main/python/resource_management/libraries/functions/install_hdp_msi.py
patching file
ambari-common/src/main/python/resource_management/libraries/functions/reload_windows_env.py
patching file
ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
patching file
ambari-common/src/main/python/resource_management/libraries/functions/windows_service_utils.py
patching file
ambari-common/src/main/python/resource_management/libraries/functions/zip_archive.py
patching file
ambari-common/src/main/python/resource_management/libraries/providers/__init__.py
patching file
ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
patching file
ambari-common/src/main/python/resource_management/libraries/script/script.py
patching file ambari-server/conf/unix/ambari.properties
patching file ambari-server/conf/windows/ambari-env.cmd
patching file ambari-server/conf/windows/ambari.properties
patching file ambari-server/conf/windows/ca.config
patching file ambari-server/conf/windows/install-helper.cmd
patching file ambari-server/conf/windows/krb5JAASLogin.conf
patching file ambari-server/conf/windows/log4j.properties
patching file ambari-server/docs/api/v1/clusters-cluster.md
patching file ambari-server/pom.xml
patching file ambari-server/src/main/assemblies/server-windows.xml
patching file
ambari-server/src/main/java/org/apache/ambari/server/DBConnectionVerification.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRunner.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/controller/sql/HostInfoProvider.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/controller/sql/SQLPropertyProvider.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/controller/sql/SinkConnectionFactory.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/resources/ResourceManager.java
patching file
ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java
patching file ambari-server/src/main/package/msi/ambari-server.wxs
patching file ambari-server/src/main/python/ambari-server-windows.py
patching file ambari-server/src/main/python/ambari-server.py
patching file ambari-server/src/main/python/ambari_server/dbConfiguration.py
patching file
ambari-server/src/main/python/ambari_server/dbConfiguration_linux.py
patching file
ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py
patching file ambari-server/src/main/python/ambari_server/properties.py
patching file ambari-server/src/main/python/ambari_server/serverConfiguration.py
patching file
ambari-server/src/main/python/ambari_server/serverConfiguration_linux.py
patching file
ambari-server/src/main/python/ambari_server/serverConfiguration_windows.py
patching file ambari-server/src/main/python/ambari_server/serverSetup.py
patching file ambari-server/src/main/python/ambari_server/serverSetup_linux.py
patching file ambari-server/src/main/python/ambari_server/serverSetup_windows.py
patching file ambari-server/src/main/python/ambari_server/setupActions.py
patching file ambari-server/src/main/python/ambari_server/setupSecurity.py
patching file ambari-server/src/main/python/ambari_server/userInput.py
patching file ambari-server/src/main/python/ambari_server/utils.py
patching file ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
patching file
ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATELOCAL.sql
patching file ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
patching file ambari-server/src/main/resources/custom_actions/check_host.py
patching file ambari-server/src/main/resources/sqlserver_properties.json
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/templates/cluster.properties.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-ANY/scripts/hook.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-ANY/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-ANY/scripts/setup_jdk.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-INSTALL/scripts/hook.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-INSTALL/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-RESTART/scripts/hook.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-START/scripts/hook.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/before-START/scripts/params.py
patching file ambari-server/src/main/resources/stacks/HDPWIN/2.1/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/repos/repoinfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/role_command_order.json
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-runtime.properties.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-startup.properties.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/oozie-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/package/scripts/falcon.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/package/scripts/falcon_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/package/scripts/falcon_server.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/package/scripts/service_mapping.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/package/templates/client.properties.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-policy.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metrics.json
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/files/draining_servers.rb
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase_decommission.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase_master.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase_regionserver.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/service_mapping.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-policy.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/metrics.json
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/datanode.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs_rebalance.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/journalnode.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/namenode.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/service_mapping.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/snamenode.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/zkfc_slave.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/templates/exclude_hosts_list.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/templates/hadoop-metrics2.properties.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/etc/hive-schema-0.12.0.mysql.sql
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/etc/hive-schema-0.12.0.oracle.sql
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/etc/hive-schema-0.12.0.postgres.sql
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/files/templetonSmoke.sh
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hcat_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hcat_service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive_metastore.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive_server.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/mysql_server.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/service_mapping.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/webhcat.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/webhcat_server.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/webhcat_service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/templates/webhcat-env.sh.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-log4j.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie_server.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/service_mapping.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/configuration/pig-log4j.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/configuration/pig-properties.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/package/scripts/pig.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/package/scripts/pig_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/package/scripts/sqoop.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/package/scripts/sqoop_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metrics.json
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/nimbus.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/service_mapping.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/status_params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/storm.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/supervisor.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/ui_server.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/package/scripts/yaml_config.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/package/scripts/tez.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/package/scripts/tez_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/capacity-scheduler.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/metrics.json
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/files/validateYarnComponentStatus.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/application_timeline_server.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/historyserver.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/mapred_service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/mapreduce2_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/nodemanager.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/resourcemanager.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/service_mapping.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/yarn.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/yarn_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/templates/container-executor.cfg.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/templates/exclude_hosts_list.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/templates/mapreduce.conf.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/templates/taskcontroller.cfg.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/templates/yarn.conf.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/metainfo.xml
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/service_check.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/service_mapping.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/zookeeper.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/zookeeper_client.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/zookeeper_server.py
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/templates/configuration.xsl.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/templates/zoo.cfg.j2
patching file
ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/stack_advisor.py
patching file ambari-server/src/main/windows/ambari-server.cmd
patching file ambari-server/src/main/windows/ambari-server.ps1
patching file
ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
patching file
ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
patching file ambari-server/src/test/python/TestAmbariServer.py
patching file ambari-server/src/test/python/TestBootstrap.py
patching file ambari-server/src/test/python/TestCheckHost.py
patching file ambari-server/src/test/python/TestOSCheck.py
patching file ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py
patching file
ambari-server/src/test/python/stacks/1.3.2/configs/default_client.json
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 354 (offset -8 lines).
Hunk #3 succeeded at 424 (offset -8 lines).
Hunk #4 succeeded at 477 (offset -8 lines).
Hunk #5 FAILED at 523.
2 out of 5 hunks FAILED -- saving rejects to file
ambari-server/src/test/python/stacks/1.3.2/configs/default_client.json.rej
patching file
ambari-server/src/test/python/stacks/1.3.2/configs/secured_client.json
Hunk #2 FAILED at 32.
Hunk #3 FAILED at 299.
Hunk #4 succeeded at 526 (offset -19 lines).
Hunk #5 succeeded at 655 (offset -19 lines).
Hunk #6 FAILED at 701.
3 out of 6 hunks FAILED -- saving rejects to file
ambari-server/src/test/python/stacks/1.3.2/configs/secured_client.json.rej
patching file
ambari-server/src/test/python/stacks/1.3.2/hooks/before-ANY/test_before_any.py
patching file
ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
patching file
ambari-server/src/test/python/stacks/1.3.2/hooks/before-START/test_before_start.py
patching file ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
patching file ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
patching file
ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
patching file
ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
Hunk #4 FAILED at 434.
Hunk #5 succeeded at 565 (offset -8 lines).
Hunk #6 succeeded at 645 (offset -8 lines).
Hunk #7 FAILED at 702.
2 out of 7 hunks FAILED -- saving rejects to file
ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json.rej
patching file ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
patching file
ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json
patching file
ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
Hunk #3 FAILED at 520.
Hunk #4 succeeded at 594 (offset -10 lines).
Hunk #5 succeeded at 668 (offset -10 lines).
Hunk #6 FAILED at 724.
2 out of 6 hunks FAILED -- saving rejects to file
ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json.rej
patching file
ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
patching file
ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
patching file
ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
patching file
ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
patching file
ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json
patching file ambari-server/src/test/python/unitTests.py
patching file ambari-shell/ambari-python-shell/pom.xml
patching file ambari-shell/pom.xml
patching file ambari-views/pom.xml
patching file ambari-web/app/app.js
patching file ambari-web/app/assets/data/configuration/cluster_env_site.json
patching file ambari-web/app/config.js
patching file ambari-web/app/controllers/global/cluster_controller.js
patching file ambari-web/app/controllers/installer.js
patching file ambari-web/app/controllers/main/admin/repositories.js
patching file
ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
patching file ambari-web/app/controllers/main/charts/heatmap.js
patching file ambari-web/app/controllers/main/host/add_controller.js
patching file ambari-web/app/controllers/main/service/info/configs.js
patching file ambari-web/app/controllers/wizard.js
patching file ambari-web/app/controllers/wizard/step2_controller.js
patching file ambari-web/app/controllers/wizard/step3_controller.js
patching file ambari-web/app/controllers/wizard/step4_controller.js
patching file ambari-web/app/controllers/wizard/step5_controller.js
patching file ambari-web/app/controllers/wizard/step7_controller.js
patching file ambari-web/app/controllers/wizard/step8_controller.js
patching file ambari-web/app/controllers/wizard/step9_controller.js
patching file ambari-web/app/data/HDP2/site_properties.js
patching file ambari-web/app/messages.js
patching file ambari-web/app/models/quick_links.js
patching file ambari-web/app/models/service_config.js
patching file ambari-web/app/models/stack_service.js
patching file ambari-web/app/templates/main/dashboard/widgets.hbs
patching file ambari-web/app/templates/main/host/summary.hbs
patching file ambari-web/app/templates/main/service/info/summary.hbs
patching file ambari-web/app/templates/wizard/step2.hbs
patching file ambari-web/app/utils/ajax/ajax.js
patching file ambari-web/app/utils/config.js
patching file ambari-web/app/utils/validator.js
patching file ambari-web/app/views/common/quick_view_link_view.js
patching file ambari-web/app/views/main/admin.js
patching file ambari-web/app/views/main/dashboard/widgets.js
patching file ambari-web/app/views/main/host/summary.js
patching file ambari-web/app/views/main/menu.js
patching file ambari-web/app/views/main/service/info/summary.js
patching file ambari-web/app/views/wizard/controls_view.js
patching file ambari-web/app/views/wizard/step1_view.js
patching file ambari-web/pom.xml
patching file ambari-web/test/views/main/dashboard/widgets_test.js
patching file
contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLPropertyProvider.java
patching file
contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
patching file
contrib/ambari-scom/ambari-scom-server/src/main/resources/sqlserver_properties.json
patching file
contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/scom/SQLPropertyProviderTest.java
patching file
contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.ddl
patching file
contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.sql
patching file
contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATELOCAL.sql
patching file
contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-DROP.sql
patching file
contrib/ambari-scom/metrics-sink/src/main/java/org/apache/hadoop/metrics2/sink/SqlSink.java
patching file contrib/views/jobs/pom.xml
patching file contrib/views/slider/pom.xml
patching file pom.xml
> Merge branch-windows-dev changes to trunk
> -----------------------------------------
>
> Key: AMBARI-8269
> URL: https://issues.apache.org/jira/browse/AMBARI-8269
> Project: Ambari
> Issue Type: Task
> Components: ambari-agent, ambari-server, ambari-web, contrib
> Affects Versions: 2.0.0
> Environment: Windows/Linux
> Reporter: Jayush Luniya
> Assignee: Jayush Luniya
> Fix For: 2.0.0
>
> Attachments: AMBARI-8269.1.patch, AMBARI-8269.2.patch,
> AMBARI-8269.patch
>
>
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
