You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2015/03/09 20:44:36 UTC
mesos git commit: Fixed the right angle brackets in the routing
library.
Repository: mesos
Updated Branches:
refs/heads/master f780f6771 -> 258b73856
Fixed the right angle brackets in the routing library.
Review: https://reviews.apache.org/r/31867
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/258b7385
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/258b7385
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/258b7385
Branch: refs/heads/master
Commit: 258b738567c97f467aa6c2d00f74e894180f6d45
Parents: f780f67
Author: Jie Yu <yu...@gmail.com>
Authored: Mon Mar 9 12:41:10 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Mar 9 12:44:15 2015 -0700
----------------------------------------------------------------------
src/linux/routing/diagnosis/diagnosis.cpp | 2 +-
src/linux/routing/diagnosis/diagnosis.hpp | 2 +-
src/linux/routing/filter/filter.hpp | 4 ++--
src/linux/routing/filter/icmp.cpp | 2 +-
src/linux/routing/filter/icmp.hpp | 2 +-
src/linux/routing/filter/ip.cpp | 2 +-
src/linux/routing/filter/ip.hpp | 2 +-
src/linux/routing/link/link.hpp | 2 +-
src/linux/routing/route.hpp | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/diagnosis/diagnosis.cpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/diagnosis/diagnosis.cpp b/src/linux/routing/diagnosis/diagnosis.cpp
index b16ea71..a44aaae 100644
--- a/src/linux/routing/diagnosis/diagnosis.cpp
+++ b/src/linux/routing/diagnosis/diagnosis.cpp
@@ -47,7 +47,7 @@ static Option<net::IP> IP(nl_addr* _ip)
}
-Try<vector<Info> > infos(int family, int states)
+Try<vector<Info>> infos(int family, int states)
{
Try<Netlink<struct nl_sock>> socket = routing::socket(NETLINK_INET_DIAG);
if (socket.isError()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/diagnosis/diagnosis.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/diagnosis/diagnosis.hpp b/src/linux/routing/diagnosis/diagnosis.hpp
index b8ce653..bba51d5 100644
--- a/src/linux/routing/diagnosis/diagnosis.hpp
+++ b/src/linux/routing/diagnosis/diagnosis.hpp
@@ -102,7 +102,7 @@ struct Info
// NOTE: 'family' is actually igored here because the older kernel
// idiag API libnl3 uses only supports TCP and ingores this value. We
// keep it here to follow libnl3-idiag's suit.
-Try<std::vector<Info> > infos(int familiy, int states);
+Try<std::vector<Info>> infos(int familiy, int states);
} // namespace socket {
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/filter/filter.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/filter/filter.hpp b/src/linux/routing/filter/filter.hpp
index a603d73..194703f 100644
--- a/src/linux/routing/filter/filter.hpp
+++ b/src/linux/routing/filter/filter.hpp
@@ -87,7 +87,7 @@ public:
const Option<Handle>& handle() const { return handle_; }
// Returns all the actions attached to this filter.
- const std::vector<process::Shared<action::Action> >& actions() const
+ const std::vector<process::Shared<action::Action>>& actions() const
{
return actions_;
}
@@ -108,7 +108,7 @@ private:
// The set of actions attached to this filer. Note that we use
// Shared here to make Filter copyable.
- std::vector<process::Shared<action::Action> > actions_;
+ std::vector<process::Shared<action::Action>> actions_;
};
} // namespace filter {
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/filter/icmp.cpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/filter/icmp.cpp b/src/linux/routing/filter/icmp.cpp
index 9076af3..706b5d1 100644
--- a/src/linux/routing/filter/icmp.cpp
+++ b/src/linux/routing/filter/icmp.cpp
@@ -274,7 +274,7 @@ Try<bool> update(
}
-Result<vector<Classifier> > classifiers(
+Result<vector<Classifier>> classifiers(
const string& link,
const queueing::Handle& parent)
{
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/filter/icmp.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/filter/icmp.hpp b/src/linux/routing/filter/icmp.hpp
index 0237f1a..431bc19 100644
--- a/src/linux/routing/filter/icmp.hpp
+++ b/src/linux/routing/filter/icmp.hpp
@@ -116,7 +116,7 @@ Try<bool> update(
// Returns the classifiers of all the ICMP packet filters attached to
// the given parent on the link. Returns None if the link or the
// parent is not found.
-Result<std::vector<Classifier> > classifiers(
+Result<std::vector<Classifier>> classifiers(
const std::string& link,
const queueing::Handle& parent);
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/filter/ip.cpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/filter/ip.cpp b/src/linux/routing/filter/ip.cpp
index 059ad6e..9d8639b 100644
--- a/src/linux/routing/filter/ip.cpp
+++ b/src/linux/routing/filter/ip.cpp
@@ -528,7 +528,7 @@ Try<bool> remove(
}
-Result<vector<Classifier> > classifiers(
+Result<vector<Classifier>> classifiers(
const string& link,
const queueing::Handle& parent)
{
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/filter/ip.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/filter/ip.hpp b/src/linux/routing/filter/ip.hpp
index 3954962..0d1dd50 100644
--- a/src/linux/routing/filter/ip.hpp
+++ b/src/linux/routing/filter/ip.hpp
@@ -200,7 +200,7 @@ Try<bool> remove(
// Returns the classifiers of all the IP packet filters attached to
// the given parent on the link. Returns none if the link or the
// parent is not found.
-Result<std::vector<Classifier> > classifiers(
+Result<std::vector<Classifier>> classifiers(
const std::string& link,
const queueing::Handle& parent);
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/link/link.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/link/link.hpp b/src/linux/routing/link/link.hpp
index c2ddd6c..094adbc 100644
--- a/src/linux/routing/link/link.hpp
+++ b/src/linux/routing/link/link.hpp
@@ -111,7 +111,7 @@ Try<bool> setMTU(const std::string& link, unsigned int mtu);
// Returns the statistics of the link.
-Result<hashmap<std::string, uint64_t> > statistics(const std::string& link);
+Result<hashmap<std::string, uint64_t>> statistics(const std::string& link);
} // namespace link {
} // namespace routing {
http://git-wip-us.apache.org/repos/asf/mesos/blob/258b7385/src/linux/routing/route.hpp
----------------------------------------------------------------------
diff --git a/src/linux/routing/route.hpp b/src/linux/routing/route.hpp
index ec3046b..933c22c 100644
--- a/src/linux/routing/route.hpp
+++ b/src/linux/routing/route.hpp
@@ -53,7 +53,7 @@ private:
// Returns the main routing table of this host.
-Try<std::vector<Rule> > table();
+Try<std::vector<Rule>> table();
// Returns the default gateway of this host.