Merge remote-tracking branch 'upstream/master'

README.md

@@ -151,12 +151,16 @@ to each other.
 
 ## Contact Us
 
-Found a bug, want to suggest a feature, or have a question?
-[File an issue](https://github.com/weaveworks/weave/issues), or email
-help@weave.works. When reporting a bug, please include which version of
-weave you are running, as shown by `weave version`.
+Found a bug, want to suggest a feature, or have a question?  You can
+[File an issue](https://github.com/weaveworks/weave/issues).  And
+there is a [Weave Users Google
+Group](https://groups.google.com/a/weave.works/forum/#!forum/weave-users),
+which you can post to by email at weave-users@weave.works.  Or you can
+contact Weaveworks directly at help@weave.works. When reporting a
+bug, please include which version of weave you are running, as shown
+by `weave version`.
 
-Follow weave on Twitter:
+Follow on Twitter:
 [@weaveworks](https://twitter.com/weaveworks).
 
 Read the Weave blog:

test/225_dns_subdomain_test.sh

@@ -0,0 +1,25 @@
+#! /bin/bash
+
+. ./config.sh
+
+C1=10.2.54.34
+C2=10.2.54.91
+C3=10.2.54.92
+DOMAIN=foo.bar
+SUBDOMAIN1=sub1.$DOMAIN
+SUBDOMAIN2=sub2.$DOMAIN
+
+start_suite "Resolve names in custom domain with subdomains"
+
+weave_on $HOST1 launch --log-level=debug --dns-domain $DOMAIN.
+
+start_container_with_dns $HOST1 $C1/24 --name=c1 -h foo.$SUBDOMAIN1
+start_container_with_dns $HOST1 $C2/24 --name=c2 -h foo.$SUBDOMAIN2
+start_container_with_dns $HOST1 $C3/24 --name=c3 -h tre.$SUBDOMAIN1 --dns-search=$SUBDOMAIN2
+
+assert_dns_record   $HOST1 c1 foo.$SUBDOMAIN2 $C2
+assert_dns_a_record $HOST1 c3 foo             $C2 foo.$SUBDOMAIN2
+assert_dns_record   $HOST1 c2 foo.$SUBDOMAIN1 $C1
+assert_dns_a_record $HOST1 c1 tre             $C3 tre.$SUBDOMAIN1
+
+end_suite