From fcbcc6f7deebf588940d78e53187374cc2201424 Mon Sep 17 00:00:00 2001
From: Allison Randal <allison@lohutok.net>
Date: Wed, 5 Mar 2014 13:59:31 -0800
Subject: [PATCH] Add query for neutron db migration conflicts.

Change-Id: I3d4a3b6b00d415c9c4b6eff76078483c2a7b88cc
Related-Bug: #1288427
---
 queries/1288427.yaml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 queries/1288427.yaml

diff --git a/queries/1288427.yaml b/queries/1288427.yaml
new file mode 100644
index 00000000..4f7b579a
--- /dev/null
+++ b/queries/1288427.yaml
@@ -0,0 +1,3 @@
+query: >
+  message:"Only a single head is supported. The script directory has multiple heads (due to branching), which must be resolved by manually editing the revision files to form a linear sequence. Run `alembic branches` to see the divergence(s)."
+  AND filename:"logs/devstacklog.txt"