Skip to content

Commit

Permalink
Backport of:
Browse files Browse the repository at this point in the history
* blockdev: fix url from comment
saltstack/salt#49668

* Documentation: fix typo in "equivalent"
saltstack/salt#49669

* states_pt3: fix rST link format
saltstack/salt#49670

* parted: fix _validate_partition_boundary
saltstack/salt#49803

* parted: fix the ordering of list command
saltstack/salt#49804

* Fix lowpkg.diff documentation and parameter name
saltstack/salt#50126

* Add root parameter to useradd, shadow and groupadd
saltstack/salt#50175

* cmd: Add root parameter for wait and run states
saltstack/salt#50302

* systemd: add optional root parameter
saltstack/salt#50380

* service: SUSE is not based on sysvinit anymore
saltstack/salt#50396

* Add new chroot module
saltstack/salt#50418

* Add new module freezer
saltstack/salt#50452

* parted: support variable length output for print
saltstack/salt#50473

* btrfs: add all subvolume commands
saltstack/salt#50541

* file: update attributes for lsattr and chattr
saltstack/salt#50607

* btrfs: add new btrfs state
saltstack/salt#50635

* zypper: demote log from error to warning
saltstack/salt#50671

* blkid: add search by token
saltstack/salt#50706

* mount: add fstab_{present,absent} states
saltstack/salt#50725

* btrfs: add option to not set subvolumes as default
saltstack/salt#50801

* Add disk_set and disk_toggle functions, and update valid partition flags
saltstack/salt#50834

* disk: support setting FAT size for format_
saltstack/salt#51074

* cmdmod: add sysfs into the chroot
saltstack/salt#51094

* mount: cache blkid information
saltstack/salt#51135
  • Loading branch information
aplanas committed Feb 4, 2019
1 parent 0fd1e40 commit 6ec4bbf
Show file tree
Hide file tree
Showing 32 changed files with 4,520 additions and 335 deletions.
2 changes: 1 addition & 1 deletion doc/man/salt.7
Original file line number Diff line number Diff line change
Expand Up @@ -45993,7 +45993,7 @@ moe:
.UNINDENT
.sp
One way to think about this might be that the \fBgid\fP key is being assigned
a value equivelent to the following python pseudo\-code:
a value equivalent to the following python pseudo\-code:
.INDENT 0.0
.INDENT 3.5
.sp
Expand Down
4 changes: 2 additions & 2 deletions doc/topics/tutorials/states_pt3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ The following example illustrates calling the ``group_to_gid`` function in the
- gid: {{ salt['file.group_to_gid']('some_group_that_exists') }}
One way to think about this might be that the ``gid`` key is being assigned
a value equivelent to the following python pseudo-code:
a value equivalent to the following python pseudo-code:

.. code-block:: python
Expand All @@ -159,7 +159,7 @@ MAC address for eth0:
salt['network.hw_addr']('eth0')
To examine the possible arguments to each execution module function,
one can examine the `module reference documentation </ref/modules/all>`:
one can examine the `module reference documentation </ref/modules/all>`_:

Advanced SLS module syntax
==========================
Expand Down
Loading

0 comments on commit 6ec4bbf

Please sign in to comment.