diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-07-08 11:32:54 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-07-08 11:32:54 +0300 |
| commit | 770b5b5aced652cd7eed9d49e6c477908a9d7efb (patch) | |
| tree | c4b2b7a6335f919510f323af419c79da74fdf7c7 /server/tests | |
| parent | ec205707eacb1187ab8f21e7e7c5150944ef349b (diff) | |
| parent | 8c36375edb9cadfec64a67f034d2a6828242df6f (diff) | |
| download | vaadin-framework-770b5b5aced652cd7eed9d49e6c477908a9d7efb.tar.gz vaadin-framework-770b5b5aced652cd7eed9d49e6c477908a9d7efb.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: I7f97cb771665485dbc9130a3c9b0365185615fc5
Diffstat (limited to 'server/tests')
| -rw-r--r-- | server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java index e938a1cd37..63f79504ff 100644 --- a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java +++ b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java @@ -63,6 +63,8 @@ public class TestClassesSerializable extends TestCase { "com\\.vaadin\\.sass.*", // "com\\.vaadin\\.testbench.*", // "com\\.vaadin\\.util\\.CurrentInstance\\$1", // + "com\\.vaadin\\.server\\.AbstractClientConnector\\$1", // + "com\\.vaadin\\.server\\.AbstractClientConnector\\$1\\$1", // "com\\.vaadin\\.server\\.JsonCodec\\$1", // "com\\.vaadin\\.server\\.communication\\.PushConnection", // "com\\.vaadin\\.server\\.communication\\.AtmospherePushConnection", // |