Merge branch 'master' into postgres-compat

cockroachdb · Apr 18, 2018 · fd8b8ba · fd8b8ba
2 parents b5cde5d + 68a5442
commit fd8b8ba
Show file tree

Hide file tree

Showing 590 changed files with 79,555 additions and 1,153 deletions.
diff --git a/_config.yml b/_config.yml
@@ -20,9 +20,8 @@ redcarpet:
 
 versions:
   stable: v2.0
-  dev: v2.0
+  dev: v2.1
   v1.2: v2.0
-  v2.1: v2.0
 
 release_info:
   v1.0:
@@ -43,19 +42,19 @@ release_info:
     docker_image: cockroachdb/cockroach
     build_time: 2018/04/04 14:48:26 (go1.10)
     start_time: 2018-04-04 15:10:52.34274101 +0000 UTC
-  # v2.1:
-  #   name: v2.1
-  #   version: v2.0.0
-  #   docker_image: cockroachdb/cockroach-unstable
-  #   build_time: 2018/03/26 14:48:26 (go1.10)
-  #   start_time: 2018-03-26 15:10:52.34274101 +0000 UTC
+  v2.1:
+    name: v2.1.0
+    version: v2.1.0-alpha.20180416
+    docker_image: cockroachdb/cockroach-unstable
+    build_time: 2018/04/16 14:48:26 (go1.10)
+    start_time: 2018-04-16 15:10:52.34274101 +0000 UTC
 
 training:
   ccl_license: crl-0-EIDA4OgGGAEiF0NvY2tyb2FjaCBMYWJzIFRyYWluaW5n
   aws_access_key: AKIAIXNAWDKXMDDNHRCA
   aws_secret_access_key: wVevB0LO5CDf5lxI9tpy%2FXuE0UZi%2Bmpahiwoa3YL
 
-exclude: ["ci", "vendor", "rfc", "v1.1/training/unused", "v2.0/training/unused"]
+exclude: ["ci", "vendor", "rfc", "v1.1/training/unused", "v2.0/training/unused", "v2.1/training/unused"]
 
 keep_files: [_internal]
 

diff --git a/_data/releases.yml b/_data/releases.yml
@@ -37,6 +37,8 @@
       version: v1.0
 - title: Testing Releases
   releases:
+    - date: April 16, 2018
+      version: v2.1.0-alpha.20180416
     - date: April 2, 2018
       version: v2.0-rc.1
     - date: Mar 26, 2018

diff --git a/_includes/azure-locations.md b/_includes/azure-locations.md
@@ -0,0 +1,30 @@
+|  Location | SQL Statement |
+|  -------- | ------------- |
+|  eastasia (East Asia) | `INSERT into system.locations VALUES ('region', 'eastasia', 22.267, 114.188)` |
+|  southeastasia (Southeast Asia) | `INSERT into system.locations VALUES ('region', 'southeastasia', 1.283, 103.833)` |
+|  centralus (Central US) | `INSERT into system.locations VALUES ('region', 'centralus', 41.5908, -93.6208)` |
+|  eastus (East US) | `INSERT into system.locations VALUES ('region', 'eastus', 37.3719, -79.8164)` |
+|  eastus2 (East US 2) | `INSERT into system.locations VALUES ('region', 'eastus2', 36.6681, -78.3889)` |
+|  westus (West US) | `INSERT into system.locations VALUES ('region', 'westus', 37.783, -122.417)` |
+|  northcentralus (North Central US) | `INSERT into system.locations VALUES ('region', 'northcentralus', 41.8819, -87.6278)` |
+|  southcentralus (South Central US) | `INSERT into system.locations VALUES ('region', 'southcentralus', 29.4167, -98.5)` |
+|  northeurope (North Europe) | `INSERT into system.locations VALUES ('region', 'northeurope', 53.3478, -6.2597)` |
+|  westeurope (West Europe) | `INSERT into system.locations VALUES ('region', 'westeurope', 52.3667, 4.9)` |
+|  japanwest (Japan West) | `INSERT into system.locations VALUES ('region', 'japanwest', 34.6939, 135.5022)` |
+|  japaneast (Japan East) | `INSERT into system.locations VALUES ('region', 'japaneast', 35.68, 139.77)` |
+|  brazilsouth (Brazil South) | `INSERT into system.locations VALUES ('region', 'brazilsouth', -23.55, -46.633)` |
+|  australiaeast (Australia East) | `INSERT into system.locations VALUES ('region', 'australiaeast', -33.86, 151.2094)` |
+|  australiasoutheast (Australia Southeast) | `INSERT into system.locations VALUES ('region', 'australiasoutheast', -37.8136, 144.9631)` |
+|  southindia (South India) | `INSERT into system.locations VALUES ('region', 'southindia', 12.9822, 80.1636)` |
+|  centralindia (Central India) | `INSERT into system.locations VALUES ('region', 'centralindia', 18.5822, 73.9197)` |
+|  westindia (West India) | `INSERT into system.locations VALUES ('region', 'westindia', 19.088, 72.868)` |
+|  canadacentral (Canada Central) | `INSERT into system.locations VALUES ('region', 'canadacentral', 43.653, -79.383)` |
+|  canadaeast (Canada East) | `INSERT into system.locations VALUES ('region', 'canadaeast', 46.817, -71.217)` |
+|  uksouth (UK South) | `INSERT into system.locations VALUES ('region', 'uksouth', 50.941, -0.799)` |
+|  ukwest (UK West) | `INSERT into system.locations VALUES ('region', 'ukwest', 53.427, -3.084)` |
+|  westcentralus (West Central US) | `INSERT into system.locations VALUES ('region', 'westcentralus', 40.890, -110.234)` |
+|  westus2 (West US 2) | `INSERT into system.locations VALUES ('region', 'westus2', 47.233, -119.852)` |
+|  koreacentral (Korea Central) | `INSERT into system.locations VALUES ('region', 'koreacentral', 37.5665, 126.9780)` |
+|  koreasouth (Korea South) | `INSERT into system.locations VALUES ('region', 'koreasouth', 35.1796, 129.0756)` |
+|  francecentral (France Central) | `INSERT into system.locations VALUES ('region', 'francecentral', 46.3772, 2.3730)` |
+|  francesouth (France South) | `INSERT into system.locations VALUES ('region', 'francesouth', 43.8345, 2.1972)` |
diff --git a/_includes/computed-columns/secondary-index.md b/_includes/computed-columns/secondary-index.md
@@ -1,4 +1,4 @@
-In this example, let's create a table with computed columns and indexes on those columns:
+In this example, let's create a table with a computed columns and an index on that column:
 
 {% include copy-clipboard.html %}
 ~~~ sql

diff --git a/_includes/orchestration/kubernetes-limitations.md b/_includes/orchestration/kubernetes-limitations.md
@@ -2,17 +2,7 @@
 
 #### Kubernetes Version
 
-Kubernetes 1.7 or higher is required. Earlier versions do not support the `maxUnavailabile` field and `PodDisruptionBudget` resource type used in the CockroachDB StatefulSet configuration.
-
-{% if page.secure == true %}
-
-If you want to run on Kubernetes 1.6, you can do so by removing `maxUnavailable` and `PodDisruptionBudget` from the [`cockroachdb-statefulset-secure.yaml`](https://github.com/cockroachdb/cockroach/blob/master/cloud/kubernetes/cockroachdb-statefulset-secure.yaml) file. Running on versions earlier than 1.6 would require more substantial changes.
-
-{% else %}
-
-If you want to run on Kubernetes 1.6, you can do so by removing `maxUnavailable` and `PodDisruptionBudget` from the [`cockroachdb-statefulset.yaml`](https://github.com/cockroachdb/cockroach/blob/master/cloud/kubernetes/cockroachdb-statefulset.yaml) file. Running on versions earlier than 1.6 would require more substantial changes.
-
-{% endif %}
+Kubernetes 1.8 or higher is required in order to use our most up-to-date configuration files. Earlier Kubernetes releases do not support some of the options used in our configuration files. If you need to run on an older version of Kubernetes, we have kept around configuration files that work on older Kubernetes releases in the versioned subdirectories of [https://github.com/cockroachdb/cockroach/tree/master/cloud/kubernetes](https://github.com/cockroachdb/cockroach/tree/master/cloud/kubernetes) (e.g., [v1.7](https://github.com/cockroachdb/cockroach/tree/master/cloud/kubernetes/v1.7)).
 
 #### Storage