Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F31852012
raw.txt
No One
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Authored By
Joe
Jun 3 2020, 10:09 AM
2020-06-03 10:09:25 (UTC+0)
Size
722 B
Referenced Files
None
Subscribers
None
raw.txt
View Options
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.
File Metadata
Details
Attached
Mime Type
text/plain; charset=utf-8
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
8424348
Default Alt Text
raw.txt (722 B)
Attached To
Mode
P11379 puppet merge fail.
Attached
Detach File
Event Timeline
Log In to Comment