From 4342a2087af15306fdb23cb8c6d7ce64c1e899de Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 11 Aug 2010 23:57:44 +0200
Subject: [PATCH] release cycle loop: start over toward 7.21.2

---
 RELEASE-NOTES          | 54 ++++--------------------------------------
 include/curl/curlver.h |  6 ++---
 2 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e91d09dd7..d33314b00 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,6 @@
-Curl and libcurl 7.21.1
+Curl and libcurl 7.21.2
 
- Public curl releases:         117
+ Public curl releases:         118
  Command line options:         138
  curl_easy_setopt() options:   180
  Public functions in libcurl:  58
@@ -9,50 +9,11 @@ Curl and libcurl 7.21.1
 
 This release includes the following changes:
 
- o maketgz: produce CHANGES automatically
- o added support for NTLM authentication when compiled with NSS
- o build: Enable configure --enable-werror
- o curl-config: --built-shared returns shared info
+ o 
 
 This release includes the following bugfixes:
 
- o configure: spell --disable-threaded-resolver correctly
- o multi: call the progress callback in all states
- o multi: unmark handle as used when no longer head of pipeline
- o sendrecv: treat all negative values from send/recv as errors
- o ftp-wildcard: avoid tight loop when used without any pattern
- o multi_socket: re-use of same socket without notifying app
- o ftp wildcard: FTP LIST parser FIX
- o urlglobbing backslash escaping bug
- o build: add enable IPV6 option for the VC makefiles
- o multi: CURLINFO_LASTSOCKET doesn't work after remove_handle
- o --libcurl: use *_LARGE options with typecasted constants
- o --libcurl: hide setopt() calls setting default options
- o curl: avoid setting libcurl options to its default
- o --libcurl: list the tricky options instead of using [REMARK]
- o http: don't enable chunked during authentication negotiations
- o upload: warn users trying to upload from stdin with anyauth
- o configure: allow environments variable to override internals
- o threaded resolver: fix timeout issue
- o multi: fix condition that remove timers before trigger
- o examples: add curl_multi_timeout
- o --retry: access violation with URL part sets continued
- o ssh: Fix compile error on 64-bit systems.
- o remote-header-name: chop filename at next semicolon
- o ftp: response timeout bug in "quote" sending
- o CUSTOMREQUEST: shouldn't be disabled when HTTP is disabled
- o Watcom makefiles overhaul.
- o NTLM tests: boost coverage by forcing the hostname
- o multi: fix FTPS connecting the data connection with OpenSSL
- o retry: consider retrying even if -f is used
- o fix SOCKS problem when using multi interface
- o typecheck-gcc: add checks for recently added options
- o SCP: send large files properly with new enough libssh2
- o multi_socket: set timeout for 100-continue
- o ";type=" URL suffix over HTTP proxy
- o acknowledge progress callback error returns during connect
- o Watcom makefile fixes
- o runtests: clear old setenv remainders before test
+ o 
 
 This release includes the following known bugs:
 
@@ -61,11 +22,6 @@ This release includes the following known bugs:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Dan Fandrich, Kamil Dudka, Krister Johansen, Pavel Raiskup, Jon Sargeant,
- Pierre Joye, Tor Arntsen, Constantine Sapuntzakis, Sidney San Martin,
- Jeff Pohlmeyer, Jan Van Boghout, Ben Greear, Guenter Knauf, Adam Light,
- Georg Lippitsch, Mike Power, Robin Cornelius, Mikael Johansson,
- Yang Tse, Ben Darnell
-
+ 
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/include/curl/curlver.h b/include/curl/curlver.h
index 681ed5772..1b1286ba8 100644
--- a/include/curl/curlver.h
+++ b/include/curl/curlver.h
@@ -30,13 +30,13 @@
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "7.21.1-DEV"
+#define LIBCURL_VERSION "7.21.2-DEV"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBCURL_VERSION_MAJOR 7
 #define LIBCURL_VERSION_MINOR 21
-#define LIBCURL_VERSION_PATCH 1
+#define LIBCURL_VERSION_PATCH 2
 
 /* This is the numeric version of the libcurl version number, meant for easier
    parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -53,7 +53,7 @@
    and it is always a greater number in a more recent release. It makes
    comparisons with greater than and less than work.
 */
-#define LIBCURL_VERSION_NUM 0x071501
+#define LIBCURL_VERSION_NUM 0x071502
 
 /*
  * This is the date and time when the full source package was created. The