The following commit has been merged in the master branch:
commit fdc6d425ad82bdb79c12e01e10612bf3afd6c775
Author: Akshita Jha
Date: Fri Aug 7 02:13:36 2015 +0530
Modify test_output.py : Ignore some fake diffs in the tasks files
diff --git a/webtools_py3/test_output.py b/webtools_py3/test_
The following commit has been merged in the master branch:
commit a8621e221e172d14f28ca5682058dc5e0fe98563
Author: Bas Couwenberg
Date: Thu Aug 6 18:10:00 2015 +0200
Fix Debian GIS AliothUrl in debian-gis.conf.
diff --git a/webtools/webconf/debian-gis.conf b/webtools/webconf/debian-gis.con
The following commit has been merged in the master branch:
commit 0697477a16f52246d4dd681dcc876df98f46805f
Author: Bas Couwenberg
Date: Thu Aug 6 19:53:23 2015 +0200
Remove debian-med PDFs not included in www-src. (removed by `jekyll build`)
diff --git a/www/img/debian-med_1.99.pdf b/www/i
The following commit has been merged in the master branch:
commit e8b8a4d953726a1d4b435ee4ee5997ee7448af2a
Author: Bas Couwenberg
Date: Thu Aug 6 17:57:24 2015 +0200
Update GIS blends website.
diff --git a/www-src/_includes/gis_menu.html b/www-src/_includes/gis_menu.html
new file mode 1006
The following commit has been merged in the master branch:
commit 7e1e0271186ce89c6bcf87cdb39b2d9bea40c751
Author: Akshita Jha
Date: Thu Aug 6 13:58:02 2015 +0530
Modify test_output.py : Do not compute diff for timestamps
diff --git a/webtools_py3/test_output.py b/webtools_py3/test_output.
The following commit has been merged in the master branch:
commit 93f945b522973694cd6f046bde50f53cc5e55682
Author: Akshita Jha
Date: Thu Aug 6 13:52:43 2015 +0530
Modify test_ouput.py : Add -s (--sloppy) flag. If '-s' flag is used, the
diff between publication class in the tasks files is n
The following commit has been merged in the master branch:
commit 9eacc9c899db14030f9133cd79c085dc0ba6954a
Author: Akshita Jha
Date: Thu Aug 6 13:53:52 2015 +0530
Modify test_output.py : Remove unwanted comments
diff --git a/webtools_py3/test_output.py b/webtools_py3/test_output.py
index b
The following commit has been merged in the master branch:
commit 231677f792b62d67e79f08b027665a00ee82ef17
Author: Akshita Jha
Date: Thu Aug 6 16:19:57 2015 +0530
Modify test_output.py : Usage: ./test_output.py
diff --git a/webtools_py3/test_output.py b/webtools_py3/test_output.py
inde