From 00c7a4f8865ee32404f883110d10d7d202cc1435 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 14 Jan 2017 14:12:39 +0100
Subject: [PATCH 1/2] vagrant: fix openbsd repo, fixes #2042

original repo is 404.
---
 Vagrantfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 26dcfc044..3d6ad05d4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -111,6 +111,8 @@ end
 
 def packages_openbsd
   return <<-EOF
+    echo 'installpath = http://ftp.hostserver.de/pub/OpenBSD/6.0/packages/amd64/' > /etc/pkg.conf
+    echo 'export PKG_PATH=http://ftp.hostserver.de/pub/OpenBSD/6.0/packages/amd64/' >> ~/.profile
     . ~/.profile
     pkg_add bash
     chsh -s /usr/local/bin/bash vagrant

From 85b3625bca51af1f4087ffce8705ada53d8bd4bf Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 14 Jan 2017 04:24:10 +0100
Subject: [PATCH 2/2] update CHANGES (1.0-maint)

---
 docs/changes.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/changes.rst b/docs/changes.rst
index f9a2f4fa1..96f28b2d9 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -131,6 +131,8 @@ Version 1.0.10rc1 (not released yet)
 
 Bug fixes:
 
+- borg serve: fix transmission data loss of pipe writes, #1268
+  This affects only the cygwin platform (not Linux, *BSD, OS X).
 - Avoid triggering an ObjectiveFS bug in xattr retrieval, #1992
 - When running out of buffer memory when reading xattrs, only skip the
   current file, #1993
@@ -152,14 +154,19 @@ Other changes:
 - tests:
 
   - vagrant / travis / tox: add Python 3.6 based testing
+  - vagrant: fix openbsd repo, fixes #2042
   - travis: fix osxfuse install (fixes OS X testing on Travis CI)
+  - travis: require succeeding OS X tests, #2028
   - use pytest-xdist to parallelize testing
 - docs:
 
   - language clarification - VM backup FAQ
+  - borg create: document how to backup stdin, #2013
+  - borg upgrade: fix incorrect title levels
 - fix typos (taken from Debian package patch)
 - remote: include data hexdump in "unexpected RPC data" error message
 - remote: log SSH command line at debug level
+- API_VERSION: use numberspaces, #2023
 
 
 Version 1.0.9 (2016-12-20)