Merge branch 'problame/replication_refactor' into InsanePrawn-master

2019-03-17 17:33:51 +01:00
parent 34052d98d6 133b7013a0
commit 17818439a0
57 changed files with 3276 additions and 2500 deletions
@@ -232,7 +232,8 @@ Job Type ``pull``
      - ZFS dataset path are received to
        ``$root_fs/$client_identity``
    * - ``interval``
-      - Interval at which to pull from the source job
+      - | Interval at which to pull from the source job (e.g. ``10m``).
+        | ``manual`` disables periodic pulling, replication then only happens on :ref:`wakeup <cli-signal-wakeup>`.
    * - ``pruning``
      - |pruning-spec|