Merge branch 'master' into service-not-found-returns-404

Conflicts:
	app/errors.py

migrations/versions/0022_add_processing_dates.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 0022_add_processing_dates
+Revises: 0021_add_job_metadata
+Create Date: 2016-02-24 17:15:47.457200
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0022_add_processing_dates'
+down_revision = '0022_add_invite_users'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('jobs', sa.Column('processing_finished', sa.DateTime(), nullable=True))
+    op.add_column('jobs', sa.Column('processing_started', sa.DateTime(), nullable=True))
+    op.add_column('notifications', sa.Column('sent_at', sa.DateTime(), nullable=True))
+
+
+def downgrade():
+    op.drop_column('notifications', 'sent_at')
+    op.drop_column('jobs', 'processing_started')
+    op.drop_column('jobs', 'processing_finished')

migrations/versions/0023_add_sender.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 0023_add_sender
+Revises: 0022_add_processing_dates
+Create Date: 2016-02-24 17:18:21.942772
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0023_add_sender'
+down_revision = '0022_add_processing_dates'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('notifications', sa.Column('sent_by', sa.String(), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('notifications', 'sent_by')
+    ### end Alembic commands ###

migrations/versions/0023_drop_token.py

@@ -1,14 +1,14 @@
 """empty message
 
 Revision ID: 0023_drop_token
-Revises: 0022_add_invite_users
+Revises: 0023_add_sender
 Create Date: 2016-02-24 13:58:04.440296
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '0023_drop_token'
-down_revision = '0022_add_invite_users'
+down_revision = '0023_add_sender'
 
 from alembic import op
 import sqlalchemy as sa