# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2016-10-17 10:39:16
# Node ID f30a7e53566626b22c213280030c5e7c4323735e
# Parent  42f3a36744f668857b569abba703c7aeb547d3a7
# Parent  f2f014dc8f4447e81ff3b99a1a9965fdc9980de0

release: merge back stable branch into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -9,3 +9,4 @@ fa695cdb411d294679ac081d595ac654e5613b03
 0e4dc11b58cad833c513fe17bac39e6850edf959 v4.3.1
 8a876f48f5cb1d018b837db28ff928500cb32cfb v4.4.0
 8dd86b410b1aac086ffdfc524ef300f896af5047 v4.4.1
+d2514226abc8d3b4f6fb57765f47d1b6fb360a05 v4.4.2
diff --git a/docs/release-notes/release-notes-4.4.2.rst b/docs/release-notes/release-notes-4.4.2.rst
new file mode 100644
--- /dev/null
+++ b/docs/release-notes/release-notes-4.4.2.rst
@@ -0,0 +1,41 @@
+|RCE| 4.4.2 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2016-10-17
+
+
+General
+^^^^^^^
+
+- packaging: pinned against rhodecode-tools 0.10.1
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+Security
+^^^^^^^^
+
+- integrations: fix 500 error on integrations page when delegated admin
+  tried to access integration page after adding some integrations.
+  Permission checks were to strict for delegated admins.
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- vcsserver: make sure we correctly ping against bundled HG/GIT/SVN binaries.
+  This should fix a problem where system binaries could be used accidentally
+  by the RhodeCode.
+- ldap: fixed email extraction issues. Empty email addresses from LDAP server
+  will no longer take precedence over those stored inside RhodeCode database.
diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
--- a/docs/release-notes/release-notes.rst
+++ b/docs/release-notes/release-notes.rst
@@ -9,6 +9,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.4.2.rst
    release-notes-4.4.1.rst
    release-notes-4.4.0.rst
    release-notes-4.3.1.rst
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -1,3 +1,6 @@
+# Generated by pip2nix 0.4.0.dev1
+# See https://github.com/johbo/pip2nix
+
 {
   Babel = super.buildPythonPackage {
     name = "Babel-1.3";
@@ -1270,7 +1273,7 @@
       md5 = "e1fa63535b40e022fa4fd646fd8b511a";
     };
     meta = {
-      license = [ pkgs.lib.licenses.asl20 ];
+      license = [ pkgs.lib.licenses.asl20 { fullName = "Apache"; } ];
     };
   };
   python-ldap = super.buildPythonPackage {
@@ -1388,13 +1391,13 @@
     };
   };
   rhodecode-tools = super.buildPythonPackage {
-    name = "rhodecode-tools-0.10.0";
+    name = "rhodecode-tools-0.10.2";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests Whoosh elasticsearch elasticsearch-dsl];
+    propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests Whoosh elasticsearch elasticsearch-dsl urllib3];
     src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.0.zip";
-      md5 = "8b74bc075ae7dd55fbd480a2406630c8";
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.2.zip";
+      md5 = "d2af3985a1a32a678944d4d48870cb04";
     };
     meta = {
       license = [ { fullName = "AGPLv3 and Proprietary"; } ];
@@ -1462,7 +1465,7 @@
       md5 = "a5fc7d05d4cb38492285553def5d4b46";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit pkgs.lib.licenses.afl21 ];
+      license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ];
     };
   };
   six = super.buildPythonPackage {
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -120,7 +120,7 @@ pyzmq==14.6.0
 # TODO: This is not available in public
 # rc-testdata==0.2.0
 
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.0.zip#md5=8b74bc075ae7dd55fbd480a2406630c8
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.2.zip#md5=d2af3985a1a32a678944d4d48870cb04
 
 
 recaptcha-client==1.0.6