diff options
| author | Haakon Dybdahl <dybdahl@yahoo-inc.com> | 2016-06-17 13:46:18 +0200 |
|---|---|---|
| committer | Haakon Dybdahl <dybdahl@yahoo-inc.com> | 2016-06-17 13:46:18 +0200 |
| commit | d519c7adc924d9093ed5a0dcbfe788fb9ccda4a1 (patch) | |
| tree | a881c7ea425bf34c09b0f064b3af35d1eaa49ad8 /node-repository | |
| parent | e5ba456729056cb2da64f586667840c087f12db2 (diff) | |
| parent | 2eceb7f4e457ffbca92403b444eaf3b07d185971 (diff) | |
Merge branch 'master' into dybis/update-author
Diffstat (limited to 'node-repository')
3 files changed, 3 insertions, 3 deletions
diff --git a/node-repository/OWNERS b/node-repository/OWNERS index cc4d4971a75..a713f3f57c3 100644 --- a/node-repository/OWNERS +++ b/node-repository/OWNERS @@ -1,2 +1,2 @@ bratseth -musum +hmusum diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Generation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Generation.java index b1be9da62fe..f466eaf9f57 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Generation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Generation.java @@ -8,7 +8,7 @@ import javax.annotation.concurrent.Immutable; * is increased when an action (restart services or reboot are the available * actions) is wanted, current is updated when the action has been done on the node. * - * @author musum + * @author hmusum */ @Immutable public class Generation { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java index a79123959cc..db4c2941970 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotNull; /** * Tests provisioning of virtual nodes * - * @author musum + * @author hmusum * @author mpolden */ public class VirtualNodeProvisioningTest { |