diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
| commit | dfdd46db80331104366747e336323095aba2c886 (patch) | |
| tree | 9d7d65a6fcee14f59b9e07dca248a9ae3e180e4e /java/src | |
| parent | c59c74dddab862ade65938e630dc0f561fcb0c2f (diff) | |
| parent | 87bb0086deadf3663c3e0ec1308e0d71a6473362 (diff) | |
| download | infinitytier-dfdd46db80331104366747e336323095aba2c886.tar.gz infinitytier-dfdd46db80331104366747e336323095aba2c886.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/zerotier/sdk/Event.java | 2 | ||||
| -rw-r--r-- | java/src/com/zerotier/sdk/PeerRole.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/zerotier/sdk/Event.java b/java/src/com/zerotier/sdk/Event.java index d315990b..436b1b22 100644 --- a/java/src/com/zerotier/sdk/Event.java +++ b/java/src/com/zerotier/sdk/Event.java @@ -90,7 +90,7 @@ public enum Event { /** * A more recent version was observed on the network * - * <p>Right now this is only triggered if a hub or supernode reports a + * <p>Right now this is only triggered if a hub or rootserver reports a * more recent version, and only once. It can be used to trigger a * software update check.</p> * diff --git a/java/src/com/zerotier/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java index 56c3ac0c..7a5156e1 100644 --- a/java/src/com/zerotier/sdk/PeerRole.java +++ b/java/src/com/zerotier/sdk/PeerRole.java @@ -39,7 +39,7 @@ public enum PeerRole { PEER_ROLE_HUB, /** - * planetary supernode + * planetary rootserver */ - PEER_ROLE_SUPERNODE + PEER_ROLE_ROOTSERVER }
\ No newline at end of file |