commit | 51c82ba2cf46b9b0c1cec52a17b8ca26b0880050 | [log] [tgz] |
---|---|---|
author | Thomas Vachuska <tom@onlab.us> | Wed Oct 29 13:04:50 2014 -0700 |
committer | Thomas Vachuska <tom@onlab.us> | Wed Oct 29 13:04:50 2014 -0700 |
tree | 3308d6d724504835657ee28d0378415c7168869b | |
parent | 88dbd49542981785261b4ea5d084dcd346aa6785 [diff] | |
parent | 6a529232f63485ef303c84496723784f6b2481b6 [diff] |
Merge remote-tracking branch 'origin/master'
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java b/core/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java index 2d29b52..e35d044 100644 --- a/core/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java +++ b/core/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java
@@ -38,7 +38,7 @@ /** * Represents no provider ID. */ - public static final ProviderId NONE = new ProviderId(); + public static final ProviderId NONE = new ProviderId("none", "none"); private final String scheme; private final String id;