D3079.id7856.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3079.id7856.diff
View Options

	diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
	--- a/roles/core/userland-software/init.sls
	+++ b/roles/core/userland-software/init.sls
	@@ -138,6 +138,7 @@
	pkg.installed:
	- pkgs:
	- bat
	+ - colordiff
	- nano
	- ripgrep
	- tree
	diff --git a/roles/paas-docker/devel/software.sls b/roles/paas-docker/devel/software.sls
	--- a/roles/paas-docker/devel/software.sls
	+++ b/roles/paas-docker/devel/software.sls
	@@ -15,7 +15,6 @@
	docker_development_utilities:
	pkg.installed:
	- pkgs:
	- - colordiff
	- git
	- jq
	- {{ packages_prefixes.python3 }}pip
	diff --git a/roles/salt-primary/software/init.sls b/roles/salt-primary/software/init.sls
	--- a/roles/salt-primary/software/init.sls
	+++ b/roles/salt-primary/software/init.sls
	@@ -21,8 +21,6 @@
	- {{ packages_prefixes.python3 }}gitpython
	# Pillar
	- {{ packages_prefixes.python3 }}salt-tower
	- # Utilities
	- - colordiff

	{{ dirs.bin }}/staging-commit-message:
	file.managed:
	diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
	--- a/roles/shellserver/userland-software/base.sls
	+++ b/roles/shellserver/userland-software/base.sls
	@@ -89,7 +89,6 @@
	- automake
	- {{ packages.bats }}
	- cmake
	- - colordiff
	- {{ packages.cppunit }}
	- git
	- git-lfs