From 0653d41a0f09d5af97b3d3c47d80e0a03bd15b5e Mon Sep 17 00:00:00 2001
From: Daniel <danielc.web@gmail.com>
Date: Thu, 18 Aug 2016 10:19:26 -0500
Subject: [PATCH] Authtoken migrations merge (0001 and 0002) for django-tenants
 support

---
 .../authtoken/migrations/0001_initial.py      |  8 +++--
 .../migrations/0002_auto_20160226_1747.py     | 34 -------------------
 2 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 rest_framework/authtoken/migrations/0002_auto_20160226_1747.py

diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py
index 75780fedf..9b04d468b 100644
--- a/rest_framework/authtoken/migrations/0001_initial.py
+++ b/rest_framework/authtoken/migrations/0001_initial.py
@@ -15,11 +15,13 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Token',
             fields=[
-                ('key', models.CharField(primary_key=True, serialize=False, max_length=40)),
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, related_name='auth_token', on_delete=models.CASCADE)),
+                ('key', models.CharField(verbose_name='Key',primary_key=True, serialize=False, max_length=40)),
+                ('created', models.DateTimeField(verbose_name='Created',auto_now_add=True)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, verbose_name='User', related_name='auth_token')),
             ],
             options={
+		'verbose_name_plural': 'Tokens',
+		'verbose_name': 'Token'
             },
             bases=(models.Model,),
         ),
diff --git a/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py b/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py
deleted file mode 100644
index 9f7e58e22..000000000
--- a/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('authtoken', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='token',
-            options={'verbose_name_plural': 'Tokens', 'verbose_name': 'Token'},
-        ),
-        migrations.AlterField(
-            model_name='token',
-            name='created',
-            field=models.DateTimeField(verbose_name='Created', auto_now_add=True),
-        ),
-        migrations.AlterField(
-            model_name='token',
-            name='key',
-            field=models.CharField(verbose_name='Key', max_length=40, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='token',
-            name='user',
-            field=models.OneToOneField(to=settings.AUTH_USER_MODEL, verbose_name='User', related_name='auth_token', on_delete=models.CASCADE),
-        ),
-    ]