start over on the 1.6.1 release...

diff --git a/ares/RELEASE-NOTES b/ares/RELEASE-NOTES
index 5d0607a6baaec6f6bfba5a0a1094c416729416b3..a96543777fc98872597b3f6a19dbe3eb5a11fe19 100644 (file)
--- a/ares/RELEASE-NOTES
+++ b/ares/RELEASE-NOTES
@@ -1,25 +1,15 @@
-This is what's new and changed in the c-ares 1.6.0 release:
+This is what's new and changed in the c-ares 1.6.1 release:
 
 Changed:
 
- o Added support for the glibc "rotate" resolv.conf option (or ARES_OPT_ROTATE)
- o Added ares_gethostbyname_file()
- o Added ares_dup()
- o Added ares_set_socket_callback()
+ o 
 
 Fixed:
 
- o improved configure detection of several functions
- o improved source code portability
- o adig supports a regular numerical dotted IP address for the -s option
- o handling of EINPROGRESS for UDP connects
- o ares_parse_ptr_reply() would cause a buffer to shrink instead of expand if a
-   reply contained 8 or more records
- o buildconf works on OS X
+ o 
 
 Thanks go to these friendly people for their efforts and contributions:
 
- Yang Tse, Charles Hardin, Carlo Contavalli, Brad Spencer, Gerald Combs,
- Gregor Jasny
+ 
 
 Have fun!

diff --git a/ares/ares_version.h b/ares/ares_version.h
index de7b972f06923be4319f7183a10f915d0cc5061a..281084534b0786ec1b1dfeb5cc90d9e4870c7cce 100644 (file)
--- a/ares/ares_version.h
+++ b/ares/ares_version.h
@@ -4,12 +4,12 @@
 #define ARES__VERSION_H
 
 #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 5
-#define ARES_VERSION_PATCH 4
+#define ARES_VERSION_MINOR 6
+#define ARES_VERSION_PATCH 1
 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
                        (ARES_VERSION_MINOR<<8)|\
                        (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.5.4-CVS"
+#define ARES_VERSION_STR "1.6.1-CVS"
 
 #ifdef  __cplusplus
 extern "C" {