Merge branch '2.1' into develop

2017-07-06 11:25:36 +03:00
parent c6b579619a 66048cf094
commit ef73f3e217
11 changed files with 210 additions and 2 deletions
--- a/server/modules/routing/schemarouter/shard_map.hh
+++ b/server/modules/routing/schemarouter/shard_map.hh
@ -52,6 +52,14 @@ public:
     */
    SERVER* get_location(std::string db);

+    /**
+     * @brief Change the location of a database
+     *
+     * @param db     Database to relocate
+     * @param target Target where database is relocated to
+     */
+    void replace_location(std::string db, SERVER* target);
+
    /**
     * @brief Check if shard contains stale information
     *