# HG changeset patch
# User lana
# Date 1374877013 25200
# Node ID 1c6217d6f52899aa0b07c5a12294aa08cee4f2f7
# Parent  516e33e98aa6b87dd95a58b18d2b7538e2648afe# Parent  7ff83261b268aee7742d0057d5facf4580015de7
Merge

diff -r 516e33e98aa6 -r 1c6217d6f528 jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java	Fri Jul 26 14:07:32 2013 -0700
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java	Fri Jul 26 15:16:53 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @compile JavaxSSLContextImpl.java ComSSLContextImpl.java
  *      JavaxTrustManagerFactoryImpl.java ComTrustManagerFactoryImpl.java
  *      JavaxKeyManagerFactoryImpl.java ComKeyManagerFactoryImpl.java
- * @run main ProviderTest
+ * @run main/othervm ProviderTest
  * @summary brokenness in the com.sun.net.ssl.SSLSecurity wrappers
  */