##// 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
debian.template
12 lines | 206 B | text/plain | TextLexer
av6
make: templatize Debian build target a la e63dfbbdbd07
r33025 FROM debian:__CODENAME__
RUN apt-get update && apt-get install -y \
build-essential \
debhelper \
muxator
docker: try to follow the best practices for writing Dockerfiles...
r34424 devscripts \
av6
make: templatize Debian build target a la e63dfbbdbd07
r33025 dh-python \
less \
python \
python-all-dev \
python-docutils \
muxator
docker: try to follow the best practices for writing Dockerfiles...
r34424 unzip \
zip