You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/03/17 21:15:17 UTC
[2/2] mesos git commit: Removed redundant statement.
Removed redundant statement.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5381b36e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5381b36e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5381b36e
Branch: refs/heads/master
Commit: 5381b36e0af364580c9e119ba872ff1c13470533
Parents: af5f259
Author: Neil Conway <ne...@gmail.com>
Authored: Fri Mar 17 11:31:09 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Fri Mar 17 14:15:00 2017 -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/5381b36e/src/common/resources.cpp
----------------------------------------------------------------------
diff --git a/src/common/resources.cpp b/src/common/resources.cpp
index cdf6a84..b64fd76 100644
--- a/src/common/resources.cpp
+++ b/src/common/resources.cpp
@@ -579,9 +579,6 @@ Try<Resources> Resources::parse(
const string& text,
const string& defaultRole)
{
- // Try to parse as a JSON Array. Otherwise, parse as a text string.
- Try<JSON::Array> json = JSON::parse<JSON::Array>(text);
-
Try<vector<Resource>> resources = Resources::fromString(text, defaultRole);
if (resources.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/5381b36e/src/v1/resources.cpp
----------------------------------------------------------------------
diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp
index 96faca4..4ffe950 100644
--- a/src/v1/resources.cpp
+++ b/src/v1/resources.cpp
@@ -581,9 +581,6 @@ Try<Resources> Resources::parse(
const string& text,
const string& defaultRole)
{
- // Try to parse as a JSON Array. Otherwise, parse as a text string.
- Try<JSON::Array> json = JSON::parse<JSON::Array>(text);
-
Try<vector<Resource>> resources = Resources::fromString(text, defaultRole);
if (resources.isError()) {