You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/07/19 04:50:12 UTC
[1/2] mesos git commit: Removed a not-useful log message.
Repository: mesos
Updated Branches:
refs/heads/master 2e5201889 -> 77ddbb62d
Removed a not-useful log message.
Review: https://reviews.apache.org/r/49602/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/30abc1c0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/30abc1c0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/30abc1c0
Branch: refs/heads/master
Commit: 30abc1c0f9af6e368821ab70329e66b24a22b048
Parents: 2e52018
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Jul 18 21:49:12 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Mon Jul 18 21:49:12 2016 -0700
----------------------------------------------------------------------
src/common/resources.cpp | 3 ---
src/v1/resources.cpp | 3 ---
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/30abc1c0/src/common/resources.cpp
----------------------------------------------------------------------
diff --git a/src/common/resources.cpp b/src/common/resources.cpp
index f6ff92b..b1bd278 100644
--- a/src/common/resources.cpp
+++ b/src/common/resources.cpp
@@ -569,9 +569,6 @@ Try<Resources> Resources::parse(
result = resources.get();
} else {
- VLOG(1) << "Parsing resources as JSON failed: " << text << "\n"
- << "Trying semicolon-delimited string format instead";
-
foreach (const string& token, strings::tokenize(text, ";")) {
vector<string> pair = strings::tokenize(token, ":");
if (pair.size() != 2) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/30abc1c0/src/v1/resources.cpp
----------------------------------------------------------------------
diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp
index 8c3f2d1..6d4ec75 100644
--- a/src/v1/resources.cpp
+++ b/src/v1/resources.cpp
@@ -571,9 +571,6 @@ Try<Resources> Resources::parse(
result = resources.get();
} else {
- VLOG(1) << "Parsing resources as JSON failed: " << text << "\n"
- << "Trying semicolon-delimited string format instead";
-
foreach (const string& token, strings::tokenize(text, ";")) {
vector<string> pair = strings::tokenize(token, ":");
if (pair.size() != 2) {
[2/2] mesos git commit: Fixed incorrect clock time in log messages.
Posted by an...@apache.org.
Fixed incorrect clock time in log messages.
Previous code included a pointer value in a log message, rather
than the clock time that the pointer points at.
Review: https://reviews.apache.org/r/49604/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/77ddbb62
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/77ddbb62
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/77ddbb62
Branch: refs/heads/master
Commit: 77ddbb62dd2ab4faaa22de8355f4766e7bbe0f2d
Parents: 30abc1c
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Jul 18 21:49:25 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Mon Jul 18 21:49:25 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/clock.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/77ddbb62/3rdparty/libprocess/src/clock.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/clock.cpp b/3rdparty/libprocess/src/clock.cpp
index 3fd616e..6116c82 100644
--- a/3rdparty/libprocess/src/clock.cpp
+++ b/3rdparty/libprocess/src/clock.cpp
@@ -326,7 +326,7 @@ void Clock::pause()
if (!clock::paused) {
*clock::initial = *clock::current = now();
clock::paused = true;
- VLOG(2) << "Clock paused at " << clock::initial;
+ VLOG(2) << "Clock paused at " << *clock::initial;
// When the clock is paused, we clear the scheduled 'ticks'
// since they no longer accurately represent when a 'tick'
@@ -356,7 +356,7 @@ void Clock::resume()
synchronized (timers_mutex) {
if (clock::paused) {
- VLOG(2) << "Clock resumed at " << clock::current;
+ VLOG(2) << "Clock resumed at " << *clock::current;
clock::paused = false;
clock::settling = false;
@@ -376,7 +376,7 @@ void Clock::advance(const Duration& duration)
*clock::advanced += duration;
*clock::current += duration;
- VLOG(2) << "Clock advanced (" << duration << ") to " << clock::current;
+ VLOG(2) << "Clock advanced (" << duration << ") to " << *clock::current;
// Schedule another "tick" if necessary. Only "ticks" that
// fire immediately will be scheduled here, since the clock
@@ -413,7 +413,7 @@ void Clock::update(const Time& time)
if (*clock::current < time) {
*clock::advanced += (time - *clock::current);
*clock::current = Time(time);
- VLOG(2) << "Clock updated to " << clock::current;
+ VLOG(2) << "Clock updated to " << *clock::current;
// Schedule another "tick" if necessary. Only "ticks" that
// fire immediately will be scheduled here, since the clock