diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-13 13:15:47 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-13 13:15:47 -0800 |
| commit | e8e6a4702b93d082a03a1c25730b631485bc6972 (patch) | |
| tree | 12a97f57072498814da39895307f0eeb97fa1cf9 /world/mkworld.cpp | |
| parent | c3e2cb9b8e6b187dc827704c69a2fbb4b5cf2909 (diff) | |
| parent | 2e5caa335a60b701dd184e775b6491e1491cf94c (diff) | |
| download | infinitytier-e8e6a4702b93d082a03a1c25730b631485bc6972.tar.gz infinitytier-e8e6a4702b93d082a03a1c25730b631485bc6972.zip | |
Merge branch 'dev' into edge
Diffstat (limited to 'world/mkworld.cpp')
| -rw-r--r-- | world/mkworld.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/world/mkworld.cpp b/world/mkworld.cpp index 03ad92f9..061d6341 100644 --- a/world/mkworld.cpp +++ b/world/mkworld.cpp @@ -100,7 +100,7 @@ int main(int argc,char **argv) std::vector<World::Root> roots; const uint64_t id = ZT_WORLD_ID_EARTH; - const uint64_t ts = 1450381818269ULL; // December 17th, 2015 + const uint64_t ts = 1452708876314ULL; // January 13th, 2016 // Alice roots.push_back(World::Root()); @@ -134,12 +134,6 @@ int main(int argc,char **argv) roots.back().stableEndpoints.push_back(InetAddress("159.203.2.154/9993")); // Toronto roots.back().stableEndpoints.push_back(InetAddress("2604:a880:cad:d0::26:7001/9993")); // Toronto - // old US-SFO, which is being kept alive for now - roots.push_back(World::Root()); - roots.back().identity = Identity("7e19876aba:0:2a6e2b2318930f60eb097f70d0f4b028b2cd6d3d0c63c014b9039ff35390e41181f216fb2e6fa8d95c1ee9667156411905c3dccfea78d8c6dfafba688170b3fa"); - roots.back().stableEndpoints.push_back(InetAddress("198.199.97.220/9993")); - roots.back().stableEndpoints.push_back(InetAddress("2604:a880:1:20::c5:f001/9993")); - // END WORLD DEFINITION // ========================================================================= |