summaryrefslogtreecommitdiffstats
path: root/application-model
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-06-29 16:30:33 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-06-29 16:30:33 +0200
commit8293220823cdf2140ba7b999adb6a096fe39459f (patch)
treef98b3c8fda6d14f197f7fa617ba2f7b644b7d033 /application-model
parent07e47f92d879cc1b7d0eb89ef8170d5366904dc7 (diff)
Use Github username as author
Diffstat (limited to 'application-model')
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstance.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ClusterId.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ConfigId.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/HostName.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceCluster.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceClusterKey.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceInstance.scala2
-rw-r--r--application-model/src/main/scala/com/yahoo/vespa/applicationmodel/TenantId.scala2
10 files changed, 10 insertions, 10 deletions
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstance.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstance.scala
index 7fadcbb52a6..68f32db22dd 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstance.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstance.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
/**
* TODO: What is this
*
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
case class ApplicationInstance[S](
tenantId: TenantId,
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.scala
index f2152e82378..8c1bfe284fa 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
import com.fasterxml.jackson.annotation.JsonValue
/**
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
// TODO: Remove this and use ApplicationName/InstanceName instead (if you need it for the JSON stuff move it to that layer and don't let it leak)
case class ApplicationInstanceId(s: String) {
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.scala
index 3d44656492e..35e00d31ba2 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
import com.fasterxml.jackson.annotation.JsonValue
/**
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
// TODO: Remove this and use ApplicationId instead (if you need it for the JSON stuff move it to that layer and don't let it leak)
case class ApplicationInstanceReference(tenantId: TenantId, applicationInstanceId: ApplicationInstanceId) {
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ClusterId.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ClusterId.scala
index e4a5da2c560..929d79c2f8e 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ClusterId.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ClusterId.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
import com.fasterxml.jackson.annotation.JsonValue
/**
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
case class ClusterId(s: String) {
// Jackson's StdKeySerializer uses toString() (and ignores annotations) for objects used as Map keys.
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ConfigId.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ConfigId.scala
index 40b828bfdba..013f2cd976b 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ConfigId.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ConfigId.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
import com.fasterxml.jackson.annotation.JsonValue
/**
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
case class ConfigId(s: String) {
// Jackson's StdKeySerializer uses toString() (and ignores annotations) for objects used as Map keys.
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/HostName.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/HostName.scala
index 87ed4d0c550..1715ed9fa80 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/HostName.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/HostName.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
import com.fasterxml.jackson.annotation.JsonValue
/**
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
case class HostName(s: String) {
// Jackson's StdKeySerializer uses toString() (and ignores annotations) for objects used as Map keys.
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceCluster.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceCluster.scala
index e4b538a8a26..6e5bb0d35b3 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceCluster.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceCluster.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
/**
* Represents a collection of service instances that together make up a service with a single cluster id.
*
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
case class ServiceCluster[S](
clusterId: ClusterId,
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceClusterKey.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceClusterKey.scala
index 50c7422d358..48a19311ffe 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceClusterKey.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceClusterKey.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
import com.fasterxml.jackson.annotation.JsonValue
/**
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
case class ServiceClusterKey(clusterId: ClusterId, serviceType: ServiceType) {
// Jackson's StdKeySerializer uses toString() (and ignores annotations) for objects used as Map keys.
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceInstance.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceInstance.scala
index 294b2c5e8f0..473e47f9d33 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceInstance.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/ServiceInstance.scala
@@ -2,6 +2,6 @@
package com.yahoo.vespa.applicationmodel
/**
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
case class ServiceInstance[S](configId: ConfigId, hostName: HostName, serviceStatus: S)
diff --git a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/TenantId.scala b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/TenantId.scala
index 669c7ce900a..17e9d1f1c7a 100644
--- a/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/TenantId.scala
+++ b/application-model/src/main/scala/com/yahoo/vespa/applicationmodel/TenantId.scala
@@ -4,7 +4,7 @@ package com.yahoo.vespa.applicationmodel
import com.fasterxml.jackson.annotation.JsonValue
/**
- * @author <a href="mailto:bakksjo@yahoo-inc.com">Oyvind Bakksjo</a>
+ * @author bakksjo
*/
// TODO: Remove this and use TenantName instead (if you need it for the JSON stuff move it to that layer and don't let it leak)
case class TenantId(s: String) {