summaryrefslogtreecommitdiff
path: root/files/puppet/modules/pixelated/.gitrepo
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-12-19 10:41:47 +0100
committervarac <varacanero@zeromail.org>2016-12-19 10:41:47 +0100
commit38e8e7b31b1b9deb39019ef8a1607d494022fab3 (patch)
tree1e06ce77c19f6a8243c39c69e171628ef581c30c /files/puppet/modules/pixelated/.gitrepo
parent16aafa5ba4b629ea65d53454fa5c9af1ca7c8250 (diff)
git subrepo pull files/puppet/modules/pixelated
subrepo: subdir: "files/puppet/modules/pixelated" merged: "21f0340" upstream: origin: "https://github.com/pixelated/puppet-pixelated.git" branch: "master" commit: "21f0340" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "841aa43"
Diffstat (limited to 'files/puppet/modules/pixelated/.gitrepo')
-rw-r--r--files/puppet/modules/pixelated/.gitrepo4
1 files changed, 2 insertions, 2 deletions
diff --git a/files/puppet/modules/pixelated/.gitrepo b/files/puppet/modules/pixelated/.gitrepo
index ac9a4c4..fccc325 100644
--- a/files/puppet/modules/pixelated/.gitrepo
+++ b/files/puppet/modules/pixelated/.gitrepo
@@ -6,6 +6,6 @@
[subrepo]
remote = https://github.com/pixelated/puppet-pixelated.git
branch = master
- commit = 6086b945165d075e911c6afc6cfc53c9932586c2
- parent = cb6740619fe003b4a1956a413844a1a2bfa4b9de
+ commit = 21f03408aea72a5dfd50d19944fbe1f8e9b209e9
+ parent = 16aafa5ba4b629ea65d53454fa5c9af1ca7c8250
cmdver = 0.3.0