Merge branch 'r2.2.2'

pusher · Jun 9, 2014 · 031985d · 031985d
2 parents 4de31e2 + 3e8ad50
commit 031985d
Showing 11 changed files with 22 additions and 18 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.2 (2014-06-09)
+
+[CHANGED] Updated the HTTPS CDN URL to `https://js.pusher.com`
+
 ## 2.2.1 (2014-05-28)
 
 [FIXED] Exception triggered by ping being sent when disconnected

diff --git a/JFile b/JFile
@@ -7,7 +7,7 @@ target_dir './dist'
 
 src_dir './src'
 
-version '2.2.1'
+version '2.2.2'
 
 bundle 'pusher.js' do
   license 'pusher-licence.js'

diff --git a/config/config.yml.example b/config/config.yml.example
@@ -20,7 +20,7 @@
   :js:
     :cdn:
       :http: http://js.pusher.com/
-      :https: https://d3dy5gmtp8yhk7.cloudfront.net/
+      :https: https://js.pusher.com/
   :s3:
     :cf_distribution_id: <YOUR AWS CLOUD FRONT DISTRIBUTION ID>
     :bucket: com.pusher.js

diff --git a/dist/flashfallback.js b/dist/flashfallback.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.1
+ * Pusher JavaScript Library v2.2.2
  * http://pusherapp.com/
  *
  * Copyright 2011, Pusher

diff --git a/dist/flashfallback.min.js b/dist/flashfallback.min.js
diff --git a/dist/pusher.js b/dist/pusher.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.1
+ * Pusher JavaScript Library v2.2.2
  * http://pusher.com/
  *
  * Copyright 2014, Pusher
@@ -626,7 +626,7 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.2.1';
+  Pusher.VERSION = '2.2.2';
   Pusher.PROTOCOL = 7;
 
   // DEPRECATED: WS connection parameters
@@ -648,7 +648,7 @@
   Pusher.unavailable_timeout = 10000;
   // CDN configuration
   Pusher.cdn_http = 'http://js.pusher.com/';
-  Pusher.cdn_https = 'https://d3dy5gmtp8yhk7.cloudfront.net/';
+  Pusher.cdn_https = 'https://js.pusher.com/';
   Pusher.dependency_suffix = '';
 
   Pusher.getDefaultStrategy = function(config) {

diff --git a/dist/pusher.min.js b/dist/pusher.min.js
diff --git a/dist/xdr.js b/dist/xdr.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.1
+ * Pusher JavaScript Library v2.2.2
  * http://pusher.com/
  *
  * Copyright 2014, Pusher

diff --git a/dist/xdr.min.js b/dist/xdr.min.js
diff --git a/dist/xhr.js b/dist/xhr.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.1
+ * Pusher JavaScript Library v2.2.2
  * http://pusher.com/
  *
  * Copyright 2014, Pusher

diff --git a/dist/xhr.min.js b/dist/xhr.min.js