Merge branch '1.2.X'

CHANGELOG.rst

@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.2.4
+=====
+
+ * updated SSL certificate for gondor run
+
+1.2.3
+=====
+
+ * upgraded six to match latest version to prevent incompatibilities with other
+   distributions using the newer version
+
 1.2.2
 =====
 
@@ -23,6 +34,11 @@ CHANGELOG
  * fixed newline output in gondor manage
  * fixed bug mercurial commit identification (use hg identify)
 
+1.1.6
+=====
+
+    This release was merged in for 1.2, but released alongside 1.2.4.
+
 1.1.5
 =====
 

gondor/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.3"
+__version__ = "1.2.4"

gondor/ssl/run.gondor.io.crt

@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
-0Q/d7yx+Q5oyDgQQDcJ6/yzVB0uQY/TdfFiAAQ==
+Zm9AZWxkYXJpb24uY29tggkA4NgI5GfOV8gwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+9w0BAQUFAAOCAQEAVISs6/5fmRw5Cy39i9p8NLOYTRbGaRkgkyuNRzFv4AhOS6fm
+wsx96BtUGSW2Nqc0uow/CvCx1Ss74r7/Zpfpfh0PwYsJ8TNjkMihoT5ymb8ROV8i
+HzGNfaG7LIsHhVuBRucF3H4ejQgmFjGx4I8c9/mbfZZL4kEu3VZI+XWj7v/xgx7n
+mwWT+Pr/6/4kjLNlCBpBDbJ83Kj3q2oSA0NKzMjZT198yUILiUKivEJUyqHE9Afm
+6wLBerTBzqUugYP6I7tC6kE4dzKcta5DPLVM2NIKFmhCtMzZHbuhcJu0QQJ8VKIx
+MNFe+olo/Uubm6HfBVCbwZce2hNwqlvBGpLq+A==
 -----END CERTIFICATE-----