stable

Clone or download

Read-only

Merge commit 'refs/changes/39/2039/3' of ssh://gerrit.tuleap.net:29418/tuleap into stable

* ssh://gerrit.tuleap.net:29418/tuleap: request #6403 - Proftpd logs can be either absolute or relative Change-Id: I2aeff355ec9e2fbea7151dad6b8a0aa4f1c14c54

Modified Files

Name
M plugins/proftpd/bin/parse_xferlog.php +25 −17 Go to diff View file
M plugins/proftpd/include/ProFTPd/Xferlog/Dao.class.php +1 −2 Go to diff View file
M plugins/proftpd/include/ProFTPd/Xferlog/FileImporter.class.php +18 −4 Go to diff View file
M plugins/proftpd/phpunit/ProFTPd/Xferlog/FileImporterTest.php +2 −2 Go to diff View file
A plugins/proftpd/phpunit/ProFTPd/Xferlog/FileImporter_PathTest.php +83 −0 Go to diff View file
A plugins/proftpd/phpunit/ProFTPd/Xferlog/_fixtures/xferlog_absolute +1 −0 Go to diff View file
A plugins/proftpd/phpunit/ProFTPd/Xferlog/_fixtures/xferlog_relative +1 −0 Go to diff View file