Merge branch 'master' of /users/git/public/csc-status
authorMatthew McPherrin <matthew@mcpherrin.ca>
Wed, 17 Oct 2012 23:28:08 +0000 (19:28 -0400)
committerMatthew McPherrin <matthew@mcpherrin.ca>
Wed, 17 Oct 2012 23:28:08 +0000 (19:28 -0400)
Conflicts:
tests.d/50_website.py

1  2 
tests.d/50_website.py

@@@ -1,7 -1,8 +1,9 @@@
  #!/usr/bin/env python
  import urllib2, sys
  
- pages=["https://csclub.uwaterloo.ca", "http://mirror.csclub.uwaterloo.ca", "http://git.csclub.uwaterloo.ca"]
+ pages=["https://csclub.uwaterloo.ca",
 -       "http://mirror.csclub.uwaterloo.ca"]
++       "http://mirror.csclub.uwaterloo.ca",
++       "http://git.csclub.uwaterloo.ca"]
  
  for page in pages:
    try: