summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xext/installfiles/mac/ZeroTier One.pkgproj2
-rw-r--r--ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec2
-rw-r--r--version.h2
-rw-r--r--windows/WinUI/AboutView.xaml4
-rw-r--r--zerotier-one.spec12
6 files changed, 17 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 1c020411..ef195c31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zerotier-one (1.2.12) unstable; urgency=medium
+
+ * See https://github.com/zerotier/ZeroTierOne for release notes.
+
+ -- Adam Ierymenko <adam.ierymenko@zerotier.com> Tue, 25 July 2018 01:00:00 -0700
+
zerotier-one (1.2.10) unstable; urgency=medium
* See https://github.com/zerotier/ZeroTierOne for release notes.
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index 866029ee..0d3d0bda 100755
--- a/ext/installfiles/mac/ZeroTier One.pkgproj
+++ b/ext/installfiles/mac/ZeroTier One.pkgproj
@@ -664,7 +664,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
- <string>1.2.10</string>
+ <string>1.2.12</string>
</dict>
<key>PROJECT_COMMENTS</key>
<dict>
diff --git a/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec b/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
index 1270652b..2fb4fe57 100644
--- a/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
+++ b/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec
@@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
<!-- version should MATCH as closely as possible with the underlying software -->
<!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
<!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
- <version>1.2.10</version>
+ <version>1.2.12</version>
<!-- <packageSourceUrl>Where is this Chocolatey package located (think GitHub)? packageSourceUrl is highly recommended for the community feed</packageSourceUrl>-->
<!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
<!--<owners>ZeroTier, Inc.</owners>-->
diff --git a/version.h b/version.h
index 808879d7..f5f6aa0b 100644
--- a/version.h
+++ b/version.h
@@ -40,7 +40,7 @@
/**
* Revision
*/
-#define ZEROTIER_ONE_VERSION_REVISION 10
+#define ZEROTIER_ONE_VERSION_REVISION 12
/**
* Build version
diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml
index b1df750b..118a61b1 100644
--- a/windows/WinUI/AboutView.xaml
+++ b/windows/WinUI/AboutView.xaml
@@ -19,9 +19,9 @@
<Run Text="ZeroTier One"/>
</Paragraph>
<Paragraph TextAlignment="Center">
- <Run FontSize="14" Text="Version 1.2.10"/>
+ <Run FontSize="14" Text="Version 1.2.12"/>
<LineBreak/>
- <Run FontSize="14" Text="(c) 2011-2017 ZeroTier, Inc."/>
+ <Run FontSize="14" Text="(c) 2011-2018 ZeroTier, Inc."/>
<LineBreak/>
<Run FontSize="14" Text="www.zerotier.com"/>
</Paragraph>
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 41af5aca..55cc1fb0 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,5 @@
Name: zerotier-one
-Version: 1.2.10
+Version: 1.2.12
Release: 1%{?dist}
Summary: ZeroTier One network virtualization service
@@ -33,13 +33,13 @@ Requires(pre): /usr/sbin/useradd, /usr/bin/getent
%description
ZeroTier is a software defined networking layer for Earth.
-It can be used for on-premise network virtualization, as a peer to peer VPN
-for mobile teams, for hybrid or multi-data-center cloud deployments, or just
+It can be used for on-premise network virtualization, as a peer to peer VPN
+for mobile teams, for hybrid or multi-data-center cloud deployments, or just
about anywhere else secure software defined virtual networking is useful.
-ZeroTier One is our OS-level client service. It allows Mac, Linux, Windows,
-FreeBSD, and soon other types of clients to join ZeroTier virtual networks
-like conventional VPNs or VLANs. It can run on native systems, VMs, or
+ZeroTier One is our OS-level client service. It allows Mac, Linux, Windows,
+FreeBSD, and soon other types of clients to join ZeroTier virtual networks
+like conventional VPNs or VLANs. It can run on native systems, VMs, or
containers (Docker, OpenVZ, etc.).
%prep