diff options
| author | John Anderson <sontek@gmail.com> | 2015-07-16 09:50:54 -0700 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-07-16 09:50:54 -0700 |
| commit | 6ef4ab0f455eea7c53c67368c18b3a0d92c9001d (patch) | |
| tree | 43e15f338c2569be899119167a3d1a8af2dbd75f /docs | |
| parent | 75bba314e8a084c40a806f6e6c13906aaa3f96e5 (diff) | |
| parent | 21e1bda51cf0473108c35a03df8b265aa40e3d4b (diff) | |
| download | pymemcache-6ef4ab0f455eea7c53c67368c18b3a0d92c9001d.tar.gz | |
Merge branch 'master' of github.com:pinterest/pymemcache into add_hashing_client
Conflicts:
docs/apidoc/pymemcache.test.rst
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/apidoc/pymemcache.test.rst | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/docs/apidoc/pymemcache.test.rst b/docs/apidoc/pymemcache.test.rst index 4cf6ba1..8b1e17b 100644 --- a/docs/apidoc/pymemcache.test.rst +++ b/docs/apidoc/pymemcache.test.rst @@ -4,14 +4,6 @@ pymemcache.test package Submodules ---------- -pymemcache.test.benchmark module --------------------------------- - -.. automodule:: pymemcache.test.benchmark - :members: - :undoc-members: - :show-inheritance: - pymemcache.test.conftest module ------------------------------- @@ -20,18 +12,18 @@ pymemcache.test.conftest module :undoc-members: :show-inheritance: -pymemcache.test.test_client module ----------------------------------- +pymemcache.test.test_benchmark module +------------------------------------- -.. automodule:: pymemcache.test.test_client +.. automodule:: pymemcache.test.test_benchmark :members: :undoc-members: :show-inheritance: -pymemcache.test.test_client_hash module ---------------------------------------- +pymemcache.test.test_client module +---------------------------------- -.. automodule:: pymemcache.test.test_client_hash +.. automodule:: pymemcache.test.test_client :members: :undoc-members: :show-inheritance: |