Merge branch 'next'

sahid · Feb 3, 2014 · f9b9f52 · f9b9f52
2 parents e4ff472 + 3b99013
commit f9b9f52
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -8,7 +8,7 @@ AC_PREREQ(2.59)
 # VERSION define is not used by the code.  It gets a version string
 # from 'git describe'; see src/ceph_ver.[ch]
 
-AC_INIT([ceph], [0.75], [[email protected]])
+AC_INIT([ceph], [0.76], [[email protected]])
 
 # Create release string.  Used with VERSION for RPMs.
 RPM_RELEASE=0

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.76-1) stable; urgency=low
+
+  * New upstream release
+
+ -- Ken Dreyer <[email protected]>  Mon, 03 Feb 2014 18:14:59 +0000
+
 ceph (0.75-1) stable; urgency=low
 
   * New upstream release

diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -6095,7 +6095,7 @@ int Client::_read_sync(Fh *f, uint64_t off, uint64_t len, bufferlist *bl)
     if (r >= 0 && r < wanted) {
       if (pos < in->size) {
 	// zero up to known EOF
-	int some = in->size - pos;
+	int64_t some = in->size - pos;
 	if (some > left)
 	  some = left;
 	bufferptr z(some);