aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS5
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
3 files changed, 9 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index 9f05a8f..d0f5529 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,10 +17,13 @@ Alan Jenkins <alan.christopher.jenkins@gmail.com>
Alexander Neumann <alexander@bumpern.de>
Benjamin Fleischer <fleiben@gmail.com>
Chris Wolfe <cwolfe@chromium.org>
-Google Inc.
+gala <gala132@users.noreply.github.com>
+George Vlahavas <vlahavas@gmail.com>
Julio Merino <jmmv@google.com>
+Julio Merino <jmmv@meroh.net>
Mike Kelly <mike@pair.com>
Miklos Szeredi <miklos@szeredi.hu>
+Miklos Szeredi <mszeredi@suse.cz>
Nikolaus Rath <Nikolaus@rath.org>
Percy Jahn <email@percyjahn.de>
Qais Patankar <qaisjp@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index f788ade..f7661b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-Draft notes for upcoming release
---------------------------------
+Release 2.6 (2015-03-01)
+------------------------
* Integrated osxfuse's copy of sshfs, which means that sshfs now works
on OS X out of the box.
@@ -8,12 +8,12 @@ Draft notes for upcoming release
* Added -o cache_clean_interval=N and -o cache_min_clean_interval=N
options to let users tune the cleaning behavior of the cache.
-Release 2.7 (2015-01-28)
+Release 2.6 (2015-01-28)
------------------------
* New maintainer (Nikolaus Rath <Nikolaus@rath.org>)
-Release 2.6 (2014-01-14)
+Release 2.5 (2014-01-14)
------------------------
* Some performance improvements for large directories.
diff --git a/configure.ac b/configure.ac
index a91ec3f..65162d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(sshfs, 2.6)
+AC_INIT(sshfs, 2.7)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_CONFIG_HEADER(config.h)