summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2014-03-11 10:42:01 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-03-16 21:42:19 +0900
commit41c2d623a8ca6b920b863246581421956ddb5e8c (patch)
tree6e1488e36120ba8cc6fd6c8a07f250f04b2ce07c
parent233c615dfd5d5873e2e88ba8071cf2a9ad8875ff (diff)
packet_data_generator: New ofproto dependency for v5 updates
Update ofproto dependency to include a merge of the mainline v5 branch which includes: * Bundle messages * Flow monitor messages * Request Forward message * Table Status message * Fix for length of Flow Update Full entry of Flow Monitor reply message Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/packet_data_generator/rebar.config6
1 files changed, 1 insertions, 5 deletions
diff --git a/ryu/tests/packet_data_generator/rebar.config b/ryu/tests/packet_data_generator/rebar.config
index 44d206a8..efcf2b18 100644
--- a/ryu/tests/packet_data_generator/rebar.config
+++ b/ryu/tests/packet_data_generator/rebar.config
@@ -18,13 +18,9 @@
[{of_protocol, ".*",
% {git, "https://github.com/FlowForwarding/of_protocol.git",
% "5d6a938bcac91d03e4542845bc014a271bab363a"}},
-% use a local repo until the following changes are merged:
-% https://github.com/FlowForwarding/of_protocol/pull/66
-% {git, "http://github.com/yamt/of_protocol.git",
-% "624e1bd1b22d9ea32dda7f251c87fab462d3f763"}},
% use local branch for merge of v5 branch and pull/66
{git, "https://github.com/horms/of_protocol.git",
- "6ad43fb8f8754a2d6673bddd40d7c03f145a2abf"}},
+ "36f81a2390586c4298c34b8a6dd7c929edbac707"}},
{flower, ".*",
{git, "http://github.com/travelping/flower.git",
"d783d8f722cb1eb2fa598d4521b309cfcc703fdb"}}]}.