Commit 9b91bd4f authored by Petr Pudlak's avatar Petr Pudlak

Merge branch 'stable-2.9' into stable-2.10

* stable-2.9
  Move the design for query splitting to the implemented list

Conflicts:
	doc/design-draft.rst
Resolution:
  Fix the missing .rst extension in 2.10.
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parents 011da406 1003d92c
......@@ -11,8 +11,8 @@ Design document drafts
design-http-server.rst
design-impexp2.rst
design-resource-model.rst
design-query-splitting.rst
design-internal-shutdown
design-storagetypes.rst
design-internal-shutdown.rst
design-glusterfs-ganeti-support.rst
design-hugepages-support.rst
design-optables.rst
......
......@@ -112,6 +112,7 @@ Draft designs
design-partitioned
design-performance-tests.rst
design-query2.rst
design-query-splitting.rst
design-reason-trail.rst
design-restricted-commands.rst
design-shared-storage.rst
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment