You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ha...@apache.org on 2017/03/18 06:55:49 UTC
[1/4] mesos git commit: Included `maintenance.html` when `make dist`.
Repository: mesos
Updated Branches:
refs/heads/1.2.x e718bc75b -> a8abde762
Included `maintenance.html` when `make dist`.
`maintenance.html` is introduced in `3ee57de6`, but it is missing in
the tarball after `make dist`. This commit fixed this problem.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/35ba2ce0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/35ba2ce0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/35ba2ce0
Branch: refs/heads/1.2.x
Commit: 35ba2ce03ab299ac18b5ca3daeeb1fb853832e5a
Parents: e718bc7
Author: Haosdent Huang <ha...@apache.org>
Authored: Mon Mar 6 00:56:39 2017 +0800
Committer: Haosdent Huang <ha...@apache.org>
Committed: Sat Mar 18 14:49:18 2017 +0800
----------------------------------------------------------------------
src/Makefile.am | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/35ba2ce0/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index c21a073..8f03caa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1570,6 +1570,7 @@ nobase_dist_pkgdata_DATA += \
webui/master/static/frameworks.html \
webui/master/static/home.html \
webui/master/static/index.html \
+ webui/master/static/maintenance.html \
webui/master/static/offers.html \
webui/master/static/pailer.html \
webui/master/static/directives/pagination.html \
[2/4] mesos git commit: Updated the maintenance tab in the webui to
auto-refresh.
Posted by ha...@apache.org.
Updated the maintenance tab in the webui to auto-refresh.
This follows the established approach used in the other controllers.
Review: https://reviews.apache.org/r/57623
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bec31a51
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bec31a51
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bec31a51
Branch: refs/heads/1.2.x
Commit: bec31a51c4c4fc21fa0f08c68d91084f9a559450
Parents: 35ba2ce
Author: Benjamin Mahler <bm...@apache.org>
Authored: Tue Mar 14 15:23:04 2017 -0700
Committer: Haosdent Huang <ha...@apache.org>
Committed: Sat Mar 18 14:49:45 2017 +0800
----------------------------------------------------------------------
src/webui/master/static/js/controllers.js | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bec31a51/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index 2ea8275..5ef3451 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -472,9 +472,10 @@
mesosApp.controller('OffersCtrl', function() {});
mesosApp.controller('MaintenanceCtrl', function($scope, $http) {
- // TODO(haosdent): Send requests to the leading master directly
- // once `leadingMasterURL` is public.
- $http.jsonp('/master/maintenance/schedule?jsonp=JSON_CALLBACK')
+ var update = function() {
+ // TODO(haosdent): Send requests to the leading master directly
+ // once `leadingMasterURL` is public.
+ $http.jsonp('/master/maintenance/schedule?jsonp=JSON_CALLBACK')
.success(function(response) {
$scope.maintenance = response;
})
@@ -483,6 +484,14 @@
popupErrorModal();
}
});
+ };
+
+ if ($scope.state) {
+ update();
+ }
+
+ var removeListener = $scope.$on('state_updated', update);
+ $scope.$on('$routeChangeStart', removeListener);
});
mesosApp.controller('FrameworkCtrl', function($scope, $routeParams) {
[3/4] mesos git commit: Fixed a webui bug where the maintenance tab
is not shown as active.
Posted by ha...@apache.org.
Fixed a webui bug where the maintenance tab is not shown as active.
Review: https://reviews.apache.org/r/57629
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ee021d26
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ee021d26
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ee021d26
Branch: refs/heads/1.2.x
Commit: ee021d26c2191127bc296f733beea277fa5bed3a
Parents: bec31a5
Author: Benjamin Mahler <bm...@apache.org>
Authored: Tue Mar 14 19:03:49 2017 -0700
Committer: Haosdent Huang <ha...@apache.org>
Committed: Sat Mar 18 14:50:01 2017 +0800
----------------------------------------------------------------------
src/webui/master/static/js/controllers.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ee021d26/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index 5ef3451..a2d2857 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -323,6 +323,10 @@
{
pathRegexp: /^\/offers/,
tab: 'offers'
+ },
+ {
+ pathRegexp: /^\/maintenance/,
+ tab: 'maintenance'
}
];
[4/4] mesos git commit: Added MESOS-7261 to 1.2.1 CHANGELOG.
Posted by ha...@apache.org.
Added MESOS-7261 to 1.2.1 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a8abde76
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a8abde76
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a8abde76
Branch: refs/heads/1.2.x
Commit: a8abde7626492bb81bee5b2519a97c0b669a7207
Parents: ee021d2
Author: Haosdent Huang <ha...@apache.org>
Authored: Sat Mar 18 14:55:30 2017 +0800
Committer: Haosdent Huang <ha...@apache.org>
Committed: Sat Mar 18 14:55:30 2017 +0800
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a8abde76/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 145825c..9558c43 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ All Issues:
** Bug
* [MESOS-7208] - Persistent volume ownership is set to root when task is running with non-root user
* [MESOS-7237] - Enabling cgroups_limit_swap can lead to "invalid argument" error.
+ * [MESOS-7261] - maintenance.html is missing during packaging.
Release Notes - Mesos - Version 1.2.0