ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [31/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Wed, 24 Feb 2016 15:08:18 GMT
Merge branch 'trunk' into branch-dev-patch-upgrade


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b5a250e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b5a250e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b5a250e

Branch: refs/heads/trunk
Commit: 4b5a250e7778ffa89e318d293dafe727d8a20644
Parents: 418745d d48fb9b
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Fri Feb 19 15:24:50 2016 +0200
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Fri Feb 19 15:24:50 2016 +0200

----------------------------------------------------------------------
 .../src/main/repo/install_ambari_tarball.py     |   2 +-
 ambari-server/conf/unix/ambari-env.sh           |   6 +-
 ambari-server/conf/unix/ambari.properties       |  30 +--
 ambari-server/conf/unix/install-helper.sh       |   7 +-
 ambari-server/conf/unix/log4j.properties        |   2 +-
 ambari-server/conf/windows/log4j.properties     |   2 +-
 ambari-server/pom.xml                           |  14 ++
 ambari-server/sbin/ambari-server                |  57 +++--
 ambari-server/src/main/conf/log4j.properties    |   2 +-
 .../controller/AmbariActionExecutionHelper.java |  13 +-
 .../ambari/server/controller/AmbariServer.java  |   3 +-
 .../internal/AbstractProviderModule.java        |  31 +--
 .../internal/UpgradeResourceProvider.java       |   1 +
 .../controller/utilities/DatabaseChecker.java   |   2 +-
 .../ambari/server/stack/MasterHostResolver.java |  53 ++--
 .../src/main/package/deb/control/preinst        |   2 +-
 ambari-server/src/main/python/ambari-server.py  |  17 +-
 .../main/python/ambari_server/BackupRestore.py  |  11 +-
 .../src/main/python/ambari_server/ambariPath.py |  41 ++++
 .../ambari_server/dbConfiguration_linux.py      |  29 +--
 .../python/ambari_server/serverConfiguration.py | 103 ++++----
 .../main/python/ambari_server/serverSetup.py    |   6 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   2 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   2 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   2 +-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |   2 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   2 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   2 +-
 .../common-services/HAWQ/2.0.0/metainfo.xml     |  16 ++
 .../HAWQ/2.0.0/package/scripts/common.py        |   9 +-
 .../2.0.0/package/scripts/hawq_constants.py     |   2 +-
 .../HAWQ/2.0.0/package/scripts/hawqmaster.py    |  19 ++
 .../HAWQ/2.0.0/package/scripts/master_helper.py |  16 +-
 .../HAWQ/2.0.0/package/scripts/params.py        |   6 +
 .../HAWQ/2.0.0/package/templates/hawq-hosts.j2  |  22 --
 .../HAWQ/2.0.0/package/templates/slaves.j2      |  22 --
 .../1.4.4.2.0/configuration/sqoop-site.xml      |  43 ++++
 .../SQOOP/1.4.4.2.0/metainfo.xml                |   6 +
 .../1.4.4.2.0/package/scripts/params_linux.py   |  20 +-
 .../SQOOP/1.4.4.2.0/package/scripts/sqoop.py    |  26 ++
 .../main/resources/scripts/Ambaripreupload.py   |   7 +
 .../stacks/HDP/2.2/role_command_order.json      |   1 -
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |  13 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     |   2 +
 .../main/resources/stacks/HDP/2.6/metainfo.xml  |  25 ++
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml |  92 +++++++
 .../HDP/2.6/services/ACCUMULO/metainfo.xml      |  26 ++
 .../stacks/HDP/2.6/services/ATLAS/metainfo.xml  |  26 ++
 .../stacks/HDP/2.6/services/FALCON/metainfo.xml |  26 ++
 .../stacks/HDP/2.6/services/FLUME/metainfo.xml  |  26 ++
 .../stacks/HDP/2.6/services/HBASE/metainfo.xml  |  26 ++
 .../stacks/HDP/2.6/services/HDFS/metainfo.xml   |  26 ++
 .../stacks/HDP/2.6/services/HIVE/metainfo.xml   |  26 ++
 .../stacks/HDP/2.6/services/KAFKA/metainfo.xml  |  26 ++
 .../HDP/2.6/services/KERBEROS/metainfo.xml      |  25 ++
 .../stacks/HDP/2.6/services/KNOX/metainfo.xml   |  26 ++
 .../stacks/HDP/2.6/services/MAHOUT/metainfo.xml |  26 ++
 .../stacks/HDP/2.6/services/OOZIE/metainfo.xml  |  26 ++
 .../stacks/HDP/2.6/services/PIG/metainfo.xml    |  26 ++
 .../stacks/HDP/2.6/services/RANGER/metainfo.xml |  29 +++
 .../HDP/2.6/services/RANGER_KMS/metainfo.xml    |  29 +++
 .../stacks/HDP/2.6/services/SLIDER/metainfo.xml |  26 ++
 .../stacks/HDP/2.6/services/SPARK/metainfo.xml  |  29 +++
 .../stacks/HDP/2.6/services/SQOOP/metainfo.xml  |  26 ++
 .../stacks/HDP/2.6/services/STORM/metainfo.xml  |  27 +++
 .../stacks/HDP/2.6/services/TEZ/metainfo.xml    |  26 ++
 .../stacks/HDP/2.6/services/YARN/metainfo.xml   |  27 +++
 .../HDP/2.6/services/ZOOKEEPER/metainfo.xml     |  26 ++
 .../stacks/HDP/2.6/services/stack_advisor.py    |  22 ++
 .../AmbariManagementControllerTest.java         |   2 +-
 .../ambari/server/state/UpgradeHelperTest.java  | 140 +++++++++--
 .../ambari/server/utils/TestVersionUtils.java   |   2 +
 .../src/test/python/TestAmbariServer.py         |   2 +-
 .../src/test/python/TestBackupRestore.py        |   3 +
 ambari-server/src/test/python/TestOSCheck.py    |   1 +
 .../src/test/python/TestResourceFilesKeeper.py  |   3 +
 .../src/test/python/TestServerClassPath.py      |   3 +
 .../src/test/python/TestServerUpgrade.py        |   2 +
 .../src/test/python/TestServerUtils.py          |   3 +
 .../2.0.6/HBASE/test_phoenix_queryserver.py     |   9 +-
 .../python/stacks/2.0.6/SQOOP/test_sqoop.py     |  12 +
 .../python/stacks/2.0.6/configs/default.json    |   5 +
 .../python/stacks/2.0.6/configs/secured.json    |   5 +
 .../test/python/stacks/2.3/configs/default.json |   5 +
 .../alerts/definition_configs_controller.js     |   1 +
 .../service/widgets/create/wizard_controller.js |  16 +-
 .../app/controllers/wizard/step8_controller.js  | 240 ++++++-------------
 ambari-web/app/messages.js                      |   8 +-
 .../mixins/common/configs/configs_comparator.js |   4 +-
 .../app/mixins/common/configs/configs_saver.js  | 217 +++++++----------
 ambari-web/app/models/host_component.js         |  44 +++-
 .../alerts/configs/alert_config_parameter.hbs   |   2 +-
 ambari-web/app/utils/helper.js                  |  20 +-
 .../stack_upgrade/upgrade_version_box_view.js   |   8 +-
 .../main/alerts/definition_configs_view.js      |  10 +-
 ambari-web/app/views/main/service/item.js       |   2 +-
 .../views/main/service/reassign/step5_view.js   |  16 +-
 .../test/controllers/wizard/step4_test.js       |  36 ++-
 .../test/controllers/wizard/step8_test.js       | 176 +-------------
 .../mixins/common/configs/configs_saver_test.js |  98 ++++----
 ambari-web/test/utils/config_test.js            |   4 -
 .../upgrade_version_box_view_test.js            |  17 +-
 .../views/main/service/info/summary_test.js     |   4 +-
 103 files changed, 1691 insertions(+), 826 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
diff --cc ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index f8e4ee1,e43a7fc..026efea
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@@ -1010,10 -990,8 +1010,10 @@@ INSERT INTO ambari_sequences(sequence_n
  INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('topology_host_group_id_seq',
0);
  INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('setting_id_seq', 0);
  INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('hostcomponentstate_id_seq',
0);
 +INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('servicecomponentdesiredstate_id_seq',
0);
 +INSERT INTO ambari_sequences(sequence_name, sequence_value) values ('servicecomponent_history_id_seq',
0);
  
- INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version', '${ambariVersion}');
+ INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version', '${ambariSchemaVersion}');
  
  insert into adminresourcetype (resource_type_id, resource_type_name)
    select 1, 'AMBARI' from dual

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-web/app/messages.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5a250e/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
----------------------------------------------------------------------


Mime
View raw message