commit 794e8be1ca49bb5ee4f808de344522d022ad2cab
Merge: 011da40 1003d92
Author: Petr Pudlak <[email protected]>
Date: Fri Jul 4 15:52:46 2014 +0200
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.
diff --cc doc/design-draft.rst
index 35f6c96,361cbbb..d7811b0
--- a/doc/design-draft.rst
+++ b/doc/design-draft.rst
@@@ -11,14 -11,11 +11,14 @@@ Design document draft
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-openvswitch.rst
+ design-hugepages-support.rst
+ design-optables.rst
+ design-ceph-ganeti-support.rst
design-daemons.rst
+ design-hsqueeze.rst
.. vim: set textwidth=72 :
.. Local Variables:
diff --cc doc/index.rst
index 5729625,d3b153a..a8206de
--- a/doc/index.rst
+++ b/doc/index.rst
@@@ -110,8 -104,8 +110,9 @@@ Draft design
design-opportunistic-locking.rst
design-ovf-support.rst
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
