Merge branch 'master' into f19

2013-12-19 11:12:01 -07:00 · 2013-12-19 11:12:01 -07:00 · b4e1222a0c
commit b4e1222a0c
parent 1499f2de51 86e6c7917a
3 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,3 +16,4 @@
 /libuv-v0.10.18.tar.gz
 /libuv-v0.10.19.tar.gz
 /libuv-v0.10.20.tar.gz
+/libuv.spec
--- a/libuv.spec
+++ b/libuv.spec
@ -4,7 +4,7 @@

 Name: libuv
 Epoch:   1
-Version: 0.10.20
+Version: 0.10.21
 Release: 1%{?dist}
 Summary: Platform layer for node.js

@ -98,6 +98,10 @@ sed -e "s#@prefix@#%{_prefix}#g" \
 %{_includedir}/uv-private

 %changelog
+* Thu Dec 19 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.21-1
+- new upstream release 0.10.21
+  https://github.com/joyent/libuv/blob/v0.10.21/ChangeLog
+
 * Thu Dec 12 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.20-1
 - new upstream release 0.10.20
  https://github.com/joyent/libuv/blob/v0.10.20/ChangeLog
--- a/2
+++ b/2
@ -1 +1 @@
-bb82eab28a64747455f1830b51fee0eb  libuv-v0.10.20.tar.gz
+ee17db987d1cfb8f20da3362cd39f23d  libuv.spec