ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade (missed files)
Date Fri, 15 Jan 2016 19:30:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade 0fa6d9fda -> 98bf536a7


Merge branch 'trunk' into branch-dev-patch-upgrade (missed files)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 98bf536a7369d3e7af27c1ff52b6a3284d3bc723
Parents: 0fa6d9f
Author: Nate Cole <ncole@hortonworks.com>
Authored: Fri Jan 15 14:30:52 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Fri Jan 15 14:30:52 2016 -0500

----------------------------------------------------------------------
 .../test/controllers/wizard/step7_test.js       | 41 --------------------
 ambari-web/test/utils/helper_test.js            |  8 ----
 .../moment-timezone-with-data-2010-2020.js      |  3 +-
 3 files changed, 1 insertion(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/98bf536a/ambari-web/test/controllers/wizard/step7_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js
index 3875e66..e93d3f7 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -1789,53 +1789,12 @@ describe('App.InstallerStep7Controller', function () {
       expect(this.yarnRmDetails.description).to.be.equal('Comma separated yarn resourcemanager
host addresses with port');
     });
 
-<<<<<<< HEAD
-    beforeEach(function () {
-      this.originalConfigsLength = configs.length;
-      installerStep7Controller.addHawqConfigsOnKerberizedCluster(configs);
-    });
-
-    it('should add three security related configs for HAWQ if Kerberos is enabled', function
() {
-      // ensure 3 new configs are added
-      expect(configs.length - this.originalConfigsLength).to.be.eql(3);
-    });
-
-    // check if all three new properties were added
-    secureProperties.forEach(function (newProperty) {
-      var id = newProperty.name + '__' + newProperty.file;
-      describe(id, function () {
-
-        beforeEach(function () {
-          this.newPropertyAdded = configs.findProperty('id', id);
-        });
-
-        it('#name', function () {
-          expect(this.newPropertyAdded.name).to.be.equal(newProperty.name);
-        });
-        it('#displayName', function () {
-          expect(this.newPropertyAdded.displayName).to.be.equal(newProperty.name);
-        });
-        it('#value', function () {
-          expect(this.newPropertyAdded.value).to.be.equal(newProperty.value);
-        });
-        it('#recommendedValue', function () {
-          expect(this.newPropertyAdded.recommendedValue).to.be.equal(newProperty.value);
-        });
-        it('#isOverridable', function () {
-          expect(this.newPropertyAdded.isOverridable).to.be.equal(newProperty.isOverridable);
-        });
-        it('#isReconfigurable', function () {
-          expect(this.newPropertyAdded.isReconfigurable).to.be.equal(newProperty.isReconfigurable);
-        });
-      });
-=======
     it('yarn.resourcemanager.scheduler.ha__yarn-client', function() {
       var expectedYarnRmSchedulerValue = 'c6401.ambari.apache.org:8030,c6402.ambari.apache.org:8030';
       expect(this.yarnRmSchedulerDetails.value).to.be.equal(expectedYarnRmSchedulerValue);
       expect(this.yarnRmSchedulerDetails.recommendedValue).to.be.equal(expectedYarnRmSchedulerValue);
       expect(this.yarnRmSchedulerDetails.displayName).to.be.equal('yarn.resourcemanager.scheduler.ha');
       expect(this.yarnRmSchedulerDetails.description).to.be.equal('Comma separated yarn resourcemanager
scheduler addresses with port');
->>>>>>> trunk
     });
   });
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/98bf536a/ambari-web/test/utils/helper_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/helper_test.js b/ambari-web/test/utils/helper_test.js
index 4a0c03f..80aec9d 100644
--- a/ambari-web/test/utils/helper_test.js
+++ b/ambari-web/test/utils/helper_test.js
@@ -246,11 +246,7 @@ describe('utils/helper', function() {
       afterEach(removeDiv);
       it('should add tooltip', function() {
         App.tooltip($('#tooltip-test'));
-<<<<<<< HEAD
-        expect($('#tooltip-test').data('tooltip').enabled).to.eql(true);
-=======
         expect($('#tooltip-test').data('tooltip').enabled).to.be.true;
->>>>>>> trunk
       });
     });
     describe('#popover()', function() {
@@ -258,11 +254,7 @@ describe('utils/helper', function() {
       afterEach(removeDiv);
       it('should add popover', function() {
         App.popover($('#tooltip-test'));
-<<<<<<< HEAD
-        expect($('#tooltip-test').data('popover').enabled).to.eql(true);
-=======
         expect($('#tooltip-test').data('popover').enabled).to.be.true;
->>>>>>> trunk
       });
     });
     describe('#App.format', function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/98bf536a/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js
----------------------------------------------------------------------
diff --git a/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js b/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js
index 2f5ac05..7ce0fe0 100644
--- a/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js
+++ b/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js
@@ -838,7 +838,6 @@
 			"America/Chicago|CST6CDT",
 			"America/Chicago|Canada/Central",
 			"America/Chicago|US/Central",
-			"America/Chicago|US/Indiana-Starke",
 			"America/Chihuahua|America/Mazatlan",
 			"America/Chihuahua|Mexico/BajaSur",
 			"America/Denver|America/Boise",
@@ -1000,4 +999,4 @@
 
 
 	return moment;
-}));
+}));
\ No newline at end of file


Mime
View raw message