opendistro-for-elasticsearch · ditac · Sep 25, 2019 · Sep 25, 2019 · Sep 25, 2019 · Sep 25, 2019
diff --git a/config/opendistro_performance_analyzer/log4j2.properties b/config/opendistro_performance_analyzer/log4j2.properties
diff --git a/pa_bin/performance-analyzer-agent b/pa_bin/performance-analyzer-agent
diff --git a/pa_config/agent-stats-metadata b/pa_config/agent-stats-metadata
diff --git a/pa_config/es_security.policy b/pa_config/es_security.policy
diff --git a/pa_config/log4j2.xml b/pa_config/log4j2.xml
diff --git a/pa_config/plugin-stats-metadata b/pa_config/plugin-stats-metadata
diff --git a/pa_config/supervisord.conf b/pa_config/supervisord.conf
diff --git a/release-notes b/release-notes
@@ -1,3 +1,4 @@
+Backporting fixes from master
 ## Version 1.2.0 (Version compatible with elasticsearch 7.2.0)
 ## New Features
 This is the release of the Open Distro Performance Analyzer that will work with elasticsearch 7.2.0
@@ -19,6 +20,7 @@ More Master metrics support: Master_Task_Queue_Time https://github.com/opendistr
 ## Version 0.8.0 (Version compatible with elasticsearch 6.6.2)
 ## New Features
 This is the release of the Open Distro Performance Analyzer that will work with elasticsearch 6.6.2
+>>>>>>> master
 
 ## Improvements
 Better measurement granularity for Master Metrics 

diff --git a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/CertificateUtils.java b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/CertificateUtils.java
diff --git a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/ConfigStatus.java b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/ConfigStatus.java
diff --git a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/DBUtils.java b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/DBUtils.java