summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-06-14 12:40:52 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-14 12:40:52 +0000
commit37be0f18e1fc4fb264f6f26c74ceadceb980a50a (patch)
treeea8bfb12f6e06c2fe3916f39630b0d15d3471023 /docs
parentd68a96e9199075f5f519c3282a8f5c2cef67ea77 (diff)
parenteba9ecbe068b7176af2d70d704029f18de3521c7 (diff)
Merge "Add yardstick section into Presentation"
Diffstat (limited to 'docs')
-rwxr-xr-xdocs/com/pres/conversation.html7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/com/pres/conversation.html b/docs/com/pres/conversation.html
index a0295b8ef..bba5e672b 100755
--- a/docs/com/pres/conversation.html
+++ b/docs/com/pres/conversation.html
@@ -115,6 +115,13 @@
</section>
<section data-markdown>
# Yardstick
+ * Performance testing framework and NFVI Validation
+ * [Contributors](https://wiki.opnfv.org/display/yardstick/People)
+ * Yardstick presentation
+ *How to Do a Pre-deployment NFVI Validation Quickly and Efficiently? Wednesday, June 22, 4:00 PM - 4:30 PM
+ *Yardstick: A Pre-deployment NFVI Validation Tool. Thursday, June 23, 3:10 PM - 3:30 PM
+ * breakout sessions
+ * Tomorrow 2PM (Yardstick in C)
</section>
<section data-markdown>
# CPerf