Added TaskSet.parent attribute to API docs, and an entry in the chang…

…elog
locustio · Dec 20, 2012 · 0e3782a · 0e3782a
1 parent 2827182
commit 0e3782a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docs/api.rst b/docs/api.rst
@@ -17,7 +17,7 @@ TaskSet class
 =============
 
 .. autoclass:: locust.core.TaskSet
-	:members: locust, min_wait, max_wait, client, tasks, interrupt, schedule_task
+	:members: locust, parent, min_wait, max_wait, client, tasks, interrupt, schedule_task
 
 task decorator
 ==============

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,13 @@
 Changelog
 ##########
 
+In master but not yet released
+==============================
+
+* Added :py:attr:`parent <locust.core.TaskSet.parent>` attribute to TaskSet class that 
+  refers to the parent TaskSet, or Locust, instance. Contributed by Aaron Daubman.
+
+
 0.6.1
 =====