Giuseppe Lavagetto: profile::etcd::tlsproxy: add testserver ACLs (241409a740)
Merge these changes? (yes/no)? yes
HEAD is currently 65ad642baec576473f84ba4a7f9adde34f7e7510
Updating 65ad642bae..241409a740
Fast-forward
 modules/profile/manifests/etcd/tlsproxy.pp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
Running git clean to clean any untracked files.
All done! HEAD is now 241409a74069699dec856b7e33145d469a4686c2
problems merging LABS
oblivian@puppetmaster1001:/srv/private/hieradata$ sudo puppet merge
Fetching new commits from: https://gerrit.wikimedia.org/r/labs/private
No changes to merge.
Fetching new commits from: https://gerrit.wikimedia.org/r/operations/puppet
No changes to merge.