summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2014-07-28 09:13:45 +0200
committerKarolin Seeger <kseeger@samba.org>2014-07-28 09:18:00 +0200
commitfcc634b483255bedf53f3aea40334c018e13dcce (patch)
tree7d59833bd515e295e70ec188e1aa2b1436b3355c /VERSION
parent97d7291d12e803076022d71556c792b0cd4e60e8 (diff)
parent80a1dfddf9086700a8de5fd6005a9179b0bb3d9e (diff)
downloadsamba-2cd741d5ceefd9e0771f5ea4891bc93baa48a165.tar.gz
Merge commit 'origin/v4-1-test^' into v4-1-stablesamba-4.1.10
This was needed because of a changed commit message (fixed version number) in v4-1-stable after generating the 'samba-4.1.9' tag. Karolin Signed-off-by: Karolin Seeger <kseeger@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 6783ea5e175..10e41cdf0d6 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=4
SAMBA_VERSION_MINOR=1
-SAMBA_VERSION_RELEASE=9
+SAMBA_VERSION_RELEASE=10
########################################################
# If a official release has a serious bug #