From: Ed Warnicke <eaw@cisco.com>
Date: Fri, 7 Feb 2014 06:35:34 +0000 (+0000)
Subject: Merge "Increase timeout for waiting for broker service in sal-binding-it."
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~514
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=6fd408a04fe4a3611843e2246ece6d7c34b76903

Merge "Increase timeout for waiting for broker service in sal-binding-it."
---

6fd408a04fe4a3611843e2246ece6d7c34b76903
diff --cc opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java
index cd4f8f158d,a19d2ed76b..9ac94e7b89
--- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java
+++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java
@@@ -1,17 -1,5 +1,12 @@@
 +/*
 + * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 + *
 + * This program and the accompanying materials are made available under the
 + * terms of the Eclipse Public License v1.0 which accompanies this distribution,
 + * and is available at http://www.eclipse.org/legal/epl-v10.html
 + */
  package org.opendaylight.controller.test.sal.binding.it;
  
- import static org.ops4j.pax.exam.CoreOptions.*;
- import static org.opendaylight.controller.test.sal.binding.it.TestHelper.*;
- 
- import javax.inject.Inject;
- 
  import org.junit.runner.RunWith;
  import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
  import org.ops4j.pax.exam.Configuration;