Merge pull request #1857 from git-lfs/release-next

release: 1.5.5
git-lfs · Jan 12, 2017 · c2dcd6f · c2dcd6f
2 parents 15ced16 + 17f3466
commit c2dcd6f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Git LFS Changelog
 
+## 1.5.5 (12 January, 2017)
+
+### Bugs
+
+* lfs: only buffer first 1k when creating a CleanPointerError #1856 (@ttaylorr)
+
 ## 1.5.4 (27 December, 2016)
 
 ### Bugs

diff --git a/config/version.go b/config/version.go
@@ -8,7 +8,7 @@ import (
 
 var (
 	GitCommit   string
-	Version     = "1.5.4"
+	Version     = "1.5.5"
 	VersionDesc string
 )
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+git-lfs (1.5.5) stable; urgency=low
+
+  * New upstream version
+
+ -- Stephen Gelman <gelman@getbraintree.com>  Thu, 12 Jan 2017 14:29:00 +0000
+
 git-lfs (1.5.4) stable; urgency=low
 
   * New upstream version

diff --git a/lfs/lfs.go b/lfs/lfs.go
@@ -17,7 +17,7 @@ import (
 )
 
 const (
-	Version = "1.5.4"
+	Version = "1.5.5"
 )
 
 var (

diff --git a/rpm/SPECS/git-lfs.spec b/rpm/SPECS/git-lfs.spec
@@ -1,5 +1,5 @@
 Name:           git-lfs
-Version:        1.5.4
+Version:        1.5.5
 Release:        1%{?dist}
 Summary:        Git extension for versioning large files
 

diff --git a/script/windows-installer/inno-setup-git-lfs-installer.iss b/script/windows-installer/inno-setup-git-lfs-installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Git LFS"
-#define MyAppVersion "1.5.4"
+#define MyAppVersion "1.5.5"
 #define MyAppPublisher "GitHub, Inc"
 #define MyAppURL "https://git-lfs.github.com/"
 #define MyAppFilePrefix "git-lfs-windows"