##// 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.

File last commit:

r34424:1baa0772 default
r36778:7bf80d9d merge default
Show More
fedora21
11 lines | 169 B | text/plain | TextLexer
Mads Kiilerich
docker: support Fedora 21
r23882 FROM fedora:21
muxator
docker: try to follow the best practices for writing Dockerfiles...
r34424 RUN yum install -y \
gcc \
gettext \
make \
python-devel \
python-docutils \
rpm-build
Mads Kiilerich
docker: support Fedora 21
r23882 # For creating repo meta data
RUN yum install -y createrepo