[48/50] [abbrv] ambari git commit: Merge remote-tracking branch 'remotes/origin/trunk' into branch-3.0-perf

2017-10-19 Thread aonishuk
http://git-wip-us.apache.org/repos/asf/ambari/blob/af30ab40/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py -- diff --cc ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py index

[48/50] [abbrv] ambari git commit: Merge remote-tracking branch 'remotes/origin/trunk' into branch-3.0-perf

2017-09-28 Thread aonishuk
http://git-wip-us.apache.org/repos/asf/ambari/blob/be73d167/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java -- diff --cc ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.