Merge 'v1.5.0' into parallels/boot2docker

* commit 'a66bce51e51fe388ecb7aa2a4f3775818af94008':
  Bump to v1.5.0
  Finally fix ttyS1! (no more hanky ttyS0 problems)
  Bump kernel to 3.18.5
  Update to 3.18.4
  Updates the VBOX version
  configure the number of cert interface

Conflicts:
	rootfs/rootfs/usr/local/etc/init.d/docker

Dockerfile

@@ -18,9 +18,11 @@ RUN apt-get update && apt-get -y install  unzip \
                         pkg-config \
                         p7zip-full
 
-ENV KERNEL_VERSION  3.16.7
-ENV AUFS_BRANCH     aufs3.16
-ENV AUFS_COMMIT     b3883c3cb86937801fdd2e188032063de617ef73
+# https://www.kernel.org/
+ENV KERNEL_VERSION  3.18.5
+# http://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/
+ENV AUFS_BRANCH     aufs3.18.1+
+ENV AUFS_COMMIT     f9f16b996df1651c5ab19bd6e6101310e3659c76
 # we use AUFS_COMMIT to get stronger repeatability guarantees
 
 # Fetch the kernel sources
@@ -193,7 +195,7 @@ RUN echo "#!/bin/sh" > $ROOTFS/usr/local/bin/autologin && \
 	echo "/bin/login -f docker" >> $ROOTFS/usr/local/bin/autologin && \
 	chmod 755 $ROOTFS/usr/local/bin/autologin && \
 	echo 'ttyS0:2345:respawn:/sbin/getty -l /usr/local/bin/autologin 9600 ttyS0 vt100' >> $ROOTFS/etc/inittab && \
-	echo 'ttyS1:2345:respawn:/sbin/getty -l /usr/local/bin/autologin 9600 ttyS0 vt100' >> $ROOTFS/etc/inittab
+	echo 'ttyS1:2345:respawn:/sbin/getty -l /usr/local/bin/autologin 9600 ttyS1 vt100' >> $ROOTFS/etc/inittab
 
 # fix "su -"
 RUN echo root > $ROOTFS/etc/sysconfig/superuser

README.md

@@ -6,7 +6,7 @@ small ~24MB download and boots in ~5s (YMMV).
 
 ## Features
 
-* Kernel 3.16.7 with AUFS, Docker v1.4.1 - using libcontainer
+* Kernel 3.16.7 with AUFS, Docker v1.5.0 - using libcontainer
 * Container persistence via disk automount on `/var/lib/docker`
 * SSH keys persistence via disk automount
 

VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0