diff options
author | Micah Anderson <micah@riseup.net> | 2017-04-24 12:04:55 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2017-04-25 16:56:36 -0400 |
commit | 10d96b990af1d680e31c291a15c7b66a6522de89 (patch) | |
tree | 0a139bf866cd517f060e502ac29adf5c27f84225 /puppet/modules/tor/.gitrepo | |
parent | f5d1850e7b3831b1ee6374627bb403aa3858a320 (diff) |
git subrepo pull (merge) puppet/modules/tor
subrepo:
subdir: "puppet/modules/tor"
merged: "5ef29012"
upstream:
origin: "https://leap.se/git/puppet_tor"
branch: "master"
commit: "5ef29012"
git-subrepo:
version: "0.4.0"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2e78d5d"
Diffstat (limited to 'puppet/modules/tor/.gitrepo')
-rw-r--r-- | puppet/modules/tor/.gitrepo | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/tor/.gitrepo b/puppet/modules/tor/.gitrepo index dfc1b3d9..5e3e3c1f 100644 --- a/puppet/modules/tor/.gitrepo +++ b/puppet/modules/tor/.gitrepo @@ -6,6 +6,6 @@ [subrepo] remote = https://leap.se/git/puppet_tor branch = master - commit = 9981a70f7ba1f9e4fe33e4eb46654295287c1fc1 - parent = 26aac7ccf240b06d65616bdd00ae472d980aaea9 - cmdver = 0.3.0 + commit = 5ef29012dccc90e68afc215be9521629a0903bc6 + parent = 747d3e9b55c8b7b7d98a63474b6de82d7114c389 + cmdver = 0.4.0 |