Branch: refs/heads/release_15.05 Home: https://github.com/galaxyproject/galaxy Commit: c1e3087ca35dbca1b0328954fe4769d666d3f934 https://github.com/galaxyproject/galaxy/commit/c1e3087ca35dbca1b0328954fe476... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-12-15 (Thu, 15 Dec 2016) Changed paths: M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_attribute.xml M tools/filters/gff/gff_filter_by_feature_count.py M tools/filters/gff/gff_filter_by_feature_count.xml Log Message: ----------- Fix an ACE vulnerability with gff filter tools. Thanks to David Wyde for the disclosure. Commit: 9ee3d01c301ca067f7b94ee3c75bd784fafc4572 https://github.com/galaxyproject/galaxy/commit/9ee3d01c301ca067f7b94ee3c75bd... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-12-15 (Thu, 15 Dec 2016) Changed paths: M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_attribute.xml M tools/filters/gff/gff_filter_by_feature_count.py M tools/filters/gff/gff_filter_by_feature_count.xml Log Message: ----------- Merge branch 'release_14.10' into release_15.01 Commit: da7afb4e22f352c40a53da8b3e18319ed7aeb844 https://github.com/galaxyproject/galaxy/commit/da7afb4e22f352c40a53da8b3e183... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-12-15 (Thu, 15 Dec 2016) Changed paths: M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_attribute.xml M tools/filters/gff/gff_filter_by_feature_count.py M tools/filters/gff/gff_filter_by_feature_count.xml Log Message: ----------- Merge branch 'release_15.01' into release_15.03 Commit: 7c443eda567ece12fb90330e131e7f97c7b63ba2 https://github.com/galaxyproject/galaxy/commit/7c443eda567ece12fb90330e131e7... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-12-15 (Thu, 15 Dec 2016) Changed paths: M tools/filters/gff/gff_filter_by_attribute.py M tools/filters/gff/gff_filter_by_attribute.xml M tools/filters/gff/gff_filter_by_feature_count.py M tools/filters/gff/gff_filter_by_feature_count.xml Log Message: ----------- Merge branch 'release_15.03' into release_15.05 Compare: https://github.com/galaxyproject/galaxy/compare/c8e9845c5c57...7c443eda567e