##// END OF EJS Templates
merge with stable...
merge with stable There were a handful of merge conflicts in the wire protocol code due to significant refactoring in default. When resolving the conflicts, I tried to produce the minimal number of changes to make the incoming security patches work with the new code. I will send some follow-up commits to get the security patches better integrated into default.
Gregory Szorc -
r36778:7bf80d9d merge default
Show More
Name Size Modified Last Commit Author
/ contrib / docker
apache-server
centos5 Loading ...
centos6 Loading ...
centos7 Loading ...
debian.template Loading ...
fedora20 Loading ...
fedora21 Loading ...
ubuntu.template Loading ...