diff options
| author | Micael Karlberg <[email protected]> | 2012-01-23 14:09:22 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-23 14:09:22 +0100 |
| commit | 7e6ac31a0c918f42e747628db8fec610f5bd424c (patch) | |
| tree | 4294a95a34fdec1e28504bd90230f15a2816e106 /lib/inets/test/httpd_SUITE.erl | |
| parent | efe40df70999f798590cdbfd6648375891aa0ab0 (diff) | |
| parent | a8af5a6bae97ddd7bfc2bcff2e701fa37f47640c (diff) | |
| download | otp-7e6ac31a0c918f42e747628db8fec610f5bd424c.tar.gz otp-7e6ac31a0c918f42e747628db8fec610f5bd424c.tar.bz2 otp-7e6ac31a0c918f42e747628db8fec610f5bd424c.zip | |
Merge branch 'maint-r15' into maint
Diffstat (limited to 'lib/inets/test/httpd_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index 5b571a9649..a4bb8f7159 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -2227,6 +2227,7 @@ ticket_5865(doc) -> ticket_5865(suite) -> []; ticket_5865(Config) -> + ?SKIP(as_of_r15_behaviour_of_calendar_has_changed), Host = ?config(host,Config), ServerRoot = ?config(server_root, Config), DocRoot = filename:join([ServerRoot, "htdocs"]), |