Merge branch 'release-0.11.3' into release

ponylang · Mar 16, 2017 · 917610c · 917610c
2 parents 3dc7568 + 9d2ab9a
commit 917610c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -213,6 +213,7 @@ after_success:
           PACKAGE_NAME="ponyc-$TRAVIS_BRANCH";
           PACKAGE_CONFLICTS="ponyc-release";
       fi;
+      make clean config=release;
       PACKAGE_ITERATION="${PACKAGE_ITERATION}${TRAVIS_BUILD_NUMBER}.`git rev-parse --short --verify HEAD^{commit}`";
       make verbose=1 arch=x86-64 config=release package_name="$PACKAGE_NAME" package_conflicts="$PACKAGE_CONFLICTS" package_base_version="`cat VERSION`" package_iteration="$PACKAGE_ITERATION" deploy && export UPLOAD=yes;
     fi;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,20 @@
 
 All notable changes to the Pony compiler and standard library will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/).
 
+## [0.11.3] - 2017-03-16
+
+### Fixed
+
+- Build Linux release binaries correctly (PR #1699)
+
+
 ## [0.11.2] - 2017-03-16
 
 ### Fixed
 
 - Fix illegal instruction errors on older cpus when using packaged Pony (PR #1686)
 - Correctly pass `arch=` when building docker image (PR #1681)
 
-### Changed
-
-- Make buffered.Reader.append accept any ByteSeq. (PR #1644)
 
 
 ## [0.11.1] - 2017-03-14

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.11.2
+0.11.3