summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-09-23 16:08:44 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-09-23 16:08:44 -0700
commit46049a1ef6d2f95d752ff860a7fbd9356e8e7b9d (patch)
treed564438e7293bf53bf0b2b7304a8a29d4516d22f /java/src
parent1f74dd4589017bd5bc34b31ff6e09e6875d5e1c7 (diff)
parent40d3993ceb64f924167572c3add7300abb434562 (diff)
downloadinfinitytier-46049a1ef6d2f95d752ff860a7fbd9356e8e7b9d.tar.gz
infinitytier-46049a1ef6d2f95d752ff860a7fbd9356e8e7b9d.zip
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/zerotier/sdk/PeerRole.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/zerotier/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java
index d7d55f05..f281c1b6 100644
--- a/java/src/com/zerotier/sdk/PeerRole.java
+++ b/java/src/com/zerotier/sdk/PeerRole.java
@@ -34,9 +34,9 @@ public enum PeerRole {
PEER_ROLE_LEAF,
/**
- * relay node
+ * upstream node
*/
- PEER_ROLE_RELAY,
+ PEER_ROLE_UPSTREAM,
/**
* root server