release: merge back stable branch into default

docs/release-notes/release-notes-4.10.1.rst

@@ -0,0 +1,41 b''
+|RCE| 4.10.1 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2017-11-07
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+
+- db: reduced fingerprint column size for Mysql compatibility.
+
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Changes column size for Mysql, no potential problems with upgrade.

.hgtags

@@ -22,3 +22,4 b' 9731914f89765d9628dc4dddc84bc9402aa124c8'
 c5a2b7d0e4bbdebc4a62d7b624befe375207b659 v4.9.0
 d9aa3b27ac9f7e78359775c75fedf7bfece232f1 v4.9.1
 4ba4d74981cec5d6b28b158f875a2540952c2f74 v4.10.0
+0a6821cbd6b0b3c21503002f88800679fa35ab63 v4.10.1

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.10.1.rst
    release-notes-4.10.0.rst
    release-notes-4.9.1.rst
    release-notes-4.9.0.rst

rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py

@@ -1158,7 +1158,7 b' class UserSshKeys(Base, BaseModel):'
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
-    ssh_key_fingerprint = Column('ssh_key_fingerprint', String(1024), nullable=False, unique=None, default=None)
+    ssh_key_fingerprint = Column('ssh_key_fingerprint', String(255), nullable=False, unique=None, default=None)
 
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
 

rhodecode/model/db.py

@@ -1207,7 +1207,7 b' class UserSshKeys(Base, BaseModel):'
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
-    ssh_key_fingerprint = Column('ssh_key_fingerprint', String(1024), nullable=False, unique=None, default=None)
+    ssh_key_fingerprint = Column('ssh_key_fingerprint', String(255), nullable=False, unique=None, default=None)
 
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))