> On Ноя. 26, 2014, 4:35 п.п., Jayush Luniya wrote: > > Patch doesnt apply to trunk > > > > hw11039:ambari jluniya$ git apply ~/Downloads/AMBARI-8442.patch > > error: patch failed: > > ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql:39 > > error: ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql: > > patch does not apply > > error: patch failed: > > ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql:47 > > error: ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql: > > patch does not apply > > error: > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml: > > already exists in working directory > > error: patch failed: > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml:26 > > error: > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml: > > patch does not apply > > error: patch failed: > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py:30 > > error: > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py: > > patch does not apply > > error: patch failed: ambari-web/app/data/HDP2/site_properties.js:105 > > error: ambari-web/app/data/HDP2/site_properties.js: patch does not apply
That is because patch already in trunk after Eugene review - Artem ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/28439/#review63114 ----------------------------------------------------------- On Ноя. 26, 2014, 12:52 д.п., Artem Baranchuk wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/28439/ > ----------------------------------------------------------- > > (Updated Ноя. 26, 2014, 12:52 д.п.) > > > Review request for Ambari, Eugene Chekanskiy and Jayush Luniya. > > > Bugs: AMBARI-8442 > https://issues.apache.org/jira/browse/AMBARI-8442 > > > Repository: ambari > > > Description > ------- > > Fix for DB, Hbase, Zookeeper and UI > > > Diffs > ----- > > ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql 69dc552 > ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql 8f6b2b4 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml > PRE-CREATION > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml > e30a165 > > ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py > 0c78c67 > ambari-web/app/data/HDP2/site_properties.js 0f68c61 > > Diff: https://reviews.apache.org/r/28439/diff/ > > > Testing > ------- > > agent and server built success. cluster deployed > > > Thanks, > > Artem Baranchuk > >
