Merge "deploy.sh: accept a timeout flag (-T)" into stable/colorado
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Wed, 31 Aug 2016 14:48:53 +0000 (14:48 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 31 Aug 2016 14:48:53 +0000 (14:48 +0000)
commitdff4ff6fa7306a2556b87a2685b1b7dce1fa7e10
tree9f0eb8665cf1527e4fbc5735f4b9aabae3136a8f
parent9360af2ce5d4ccef3c58dc301384db5310a04300
parent8b5c1c1378ec846827b8307b27c0e838dbb8e516
Merge "deploy.sh: accept a timeout flag (-T)" into stable/colorado