-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/41832/
-----------------------------------------------------------
(Updated Jan. 5, 2016, 12:55 a.m.)
Review request for Ambari, Alexander Denissov, Alejandro Fernandez, bhuvnesh
chaudhary, Jaimin Jetly, jun aoki, Matt, Newton Alex, and Oleksandr Diachenko.
Changes
-------
Resolve merge conflicts with updated trunk.
Bugs: AMBARI-14527
https://issues.apache.org/jira/browse/AMBARI-14527
Repository: ambari
Description
-------
Driven by HAWQ change https://issues.apache.org/jira/browse/HAWQ-40
Diffs (updated)
-----
ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/master_helper.py
e15b64d
Diff: https://reviews.apache.org/r/41832/diff/
Testing
-------
Manually tested by adding HAWQ (using add service).
Thanks,
Lav Jain
