Merge pull request #17540 from code-dot-org/dtp_candidate_01d4f1bd

DTP (Test > Production: 01d4f1b)

Gemfile

@@ -28,16 +28,17 @@ gem 'mysql2', '~> 0.3.13'
 # Ref: https://github.com/bdurand/seamless_database_pool/pull/39
 gem 'seamless_database_pool', github: 'wjordan/seamless_database_pool', ref: 'cdo'
 
-gem 'consistent-hashing', '~> 1.0.0'
 gem 'dalli' # memcached
 gem 'dalli-elasticache' # ElastiCache Auto Discovery memcached nodes
 gem 'google_drive'
+gem 'jumphash'
 gem 'le', '~> 2.2'
 gem 'os'
 gem 'parallel'
 gem 'redis', '~> 3.3.3'
 # Using commit ref on fork until maintainer publishes a new version.
 gem 'redis-slave-read', require: false, github: 'code-dot-org/redis-slave-read', ref: 'cfe1bd0f5cf65eee5b52560139cab133f22cb880'
+gem 'xxhash'
 
 gem 'google-api-client'
 gem 'launchy' # Peer dependency of Google::APIClient::InstalledAppFlow

Gemfile.lock

@@ -197,12 +197,9 @@ GEM
       io-like (~> 0.3.0)
     arel (7.1.4)
     ast (2.3.0)
-    atomic (1.1.99)
     attr_required (1.0.1)
     auto_strip_attributes (2.1.0)
       activerecord (>= 3.0)
-    avl_tree (1.2.1)
-      atomic (~> 1.1)
     aws-sdk (2.9.14)
       aws-sdk-resources (= 2.9.14)
     aws-sdk-core (2.9.14)
@@ -255,8 +252,6 @@ GEM
       activerecord (~> 5.0.0)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
-    consistent-hashing (1.0.0)
-      avl_tree (>= 1.1.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     cucumber (2.4.0)
@@ -403,6 +398,7 @@ GEM
       url_safe_base64
     jsonapi-serializers (1.0.0)
       activesupport
+    jumphash (0.1.0)
     jwt (1.5.4)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
@@ -744,6 +740,7 @@ GEM
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
+    xxhash (0.4.0)
     youtube-dl.rb (0.3.1.2016.08.19)
       cocaine (>= 0.5.4)
 
@@ -770,7 +767,6 @@ DEPENDENCIES
   codemirror-rails
   colorize
   composite_primary_keys
-  consistent-hashing (~> 1.0.0)
   cucumber (~> 2.4.0)
   daemons
   dalli
@@ -804,6 +800,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   jquery-ui-rails (~> 5.0.3)
+  jumphash
   jwt
   kaminari
   launchy
@@ -885,7 +882,8 @@ DEPENDENCIES
   vcr
   web-console
   webmock
+  xxhash
   youtube-dl.rb
 
 BUNDLED WITH
-   1.15.3
+   1.15.4

apps/i18n/common/en_us.json

@@ -75,6 +75,7 @@
   "censusPhysicalComputing": "Physical computing / robotics",
   "censusPledge": "I pledge to expand computer science offerings at my school, and to engage a diverse group of students, to bring opportunity to all.",
   "censusTextBased": "Text-based programming in a language such as Java, Python, C++, etc. (Excluding HTML or CSS)",
+  "censusThankYou": "Thank you for your submission!",
   "censusWebDesign": "Web design using HTML or CSS",
   "challengeLevelIntro": "Challenge Puzzles are lessons designed to push your skills to a new level.",
   "challengeLevelPassTitle": "You did it!",