The branch, master has been updated via 2bdaf53 VERSION: change to 4.2.0pre1 via a0130c6 Merge remote-tracking branch 'origin/v4-1-test' into master via e56343f VERSION: Set version to 4.1.0rc1-GITSNAPSHOT. via 0025e97 WHATSNEW: Start release notes for Samba 4.1.0rc1. via d641469 Make the output of the crackname script more readable via 47bd903 s3-winbind: Allow sec_initial_uid() to store creds. via c153e6c selftest: Use higher ip numbers. via bb122b0 selftest: Add a newline to root entries in the nss files. via 6a0cb7d selftest: Fix domain name of plugindc. via 99c800b torture: Don't segfault in smb2.session on error. via 096ff2e torture: Don't segfault in raw.session on error. via 67c8f87 torture: Fix comparsion of uninitalized bytes. via bef3fc8 tsocket: Pass the full port number to getaddrinfo(). from af6d9ce tevent: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2bdaf532cde6e5529cf7d0136b149eb82f7ef601 Author: Stefan Metzmacher <me...@samba.org> Date: Fri Jul 5 12:32:07 2013 +0200 VERSION: change to 4.2.0pre1 Signed-off-by: Stefan Metzmacher <me...@samba.org> commit a0130c662a40d6951fadae4bd9a6f7c230df05db Merge: af6d9cebaf3bc4b564952e445af035fe8aece662 e56343f1bba603852afcb816f7b5ebdf680c182e Author: Stefan Metzmacher <me...@samba.org> Date: Fri Jul 5 12:07:53 2013 +0200 Merge remote-tracking branch 'origin/v4-1-test' into master git merge -s ours origin/v4-1-test Signed-off-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index 766989c..59990a3 100644 --- a/VERSION +++ b/VERSION @@ -24,7 +24,7 @@ # -> "3.0.0" # ######################################################## SAMBA_VERSION_MAJOR=4 -SAMBA_VERSION_MINOR=1 +SAMBA_VERSION_MINOR=2 SAMBA_VERSION_RELEASE=0 ######################################################## -- Samba Shared Repository