Skip to content

G
graces
Commit 8ccd4c03 authored by lixiaofang's avatar lixiaofang
Browse files
Options

最新gaia代码

parents f5c3046f ba9edd82
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 0 deletions
.idea/workspace.xml
View file @ 8ccd4c03
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<<<<<<< HEAD
<list default="true" id="f84a58a6-0272-4806-8e67-f793e01f4a55" name="Default Changelist" comment=""> <list default="true" id="f84a58a6-0272-4806-8e67-f793e01f4a55" name="Default Changelist" comment="">
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
...@@ -13,6 +14,9 @@ ...@@ -13,6 +14,9 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37 >>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
</list> </list>
=======
<list default="true" id="f84a58a6-0272-4806-8e67-f793e01f4a55" name="Default Changelist" comment="" />
>>>>>>> ba9edd82277593cb1c9462ab1af75927c39b4b12
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -96,17 +100,66 @@ ...@@ -96,17 +100,66 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/requirements/common.txt"> <entry file="file://$PROJECT_DIR$/requirements/common.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<state relative-caret-position="340"> <state relative-caret-position="340">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" /> <caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
<folding> <folding>
<element signature="e#3463#4696#0" /> <element signature="e#3463#4696#0" />
=======
<state relative-caret-position="104">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/mapping/problem.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-415" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gaia/settings.py.template">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gaia/settings_ci.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="23" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gaia/log_settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="4" column="25" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-192">
<caret line="188" column="49" selection-start-line="188" selection-start-column="49" selection-end-line="188" selection-end-column="49" />
<folding>
<element signature="e#1265#5226#0" />
<element signature="e#9397#12894#0" />
<element signature="e#12961#19656#0" />
>>>>>>> ba9edd82277593cb1c9462ab1af75927c39b4b12
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/trans2es/mapping/problem.json"> <entry file="file://$PROJECT_DIR$/trans2es/mapping/problem.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-415" /> <state relative-caret-position="-415" />
...@@ -164,6 +217,8 @@ ...@@ -164,6 +217,8 @@
<<<<<<< HEAD <<<<<<< HEAD
======= =======
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
=======
>>>>>>> ba9edd82277593cb1c9462ab1af75927c39b4b12
<entry file="file://$PROJECT_DIR$/injection/data_sync/tasks.py"> <entry file="file://$PROJECT_DIR$/injection/data_sync/tasks.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105"> <state relative-caret-position="105">
...@@ -185,16 +240,23 @@ ...@@ -185,16 +240,23 @@
<entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py"> <entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223"> <state relative-caret-position="223">
<<<<<<< HEAD
<caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" /> <caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
======= =======
<state relative-caret-position="67"> <state relative-caret-position="67">
<caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" /> <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37 >>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
=======
<caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
>>>>>>> ba9edd82277593cb1c9462ab1af75927c39b4b12
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<<<<<<< HEAD
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
=======
>>>>>>> ba9edd82277593cb1c9462ab1af75927c39b4b12
</leaf> </leaf>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
...@@ -345,6 +407,7 @@ ...@@ -345,6 +407,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="6" /> <frame x="-323" y="-1080" width="1920" height="1080" extended-state="6" />
<editor active="true" /> <editor active="true" />
...@@ -374,6 +437,14 @@ ...@@ -374,6 +437,14 @@
<window_info id="DB Browser" order="2" weight="0.32964718" /> <window_info id="DB Browser" order="2" weight="0.32964718" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37 >>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
=======
<frame x="0" y="23" width="1280" height="723" extended-state="0" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30976966" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="DB Browser" order="2" weight="0.32964718" />
<window_info id="Favorites" order="3" side_tool="true" />
>>>>>>> ba9edd82277593cb1c9462ab1af75927c39b4b12
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" /> <window_info anchor="bottom" id="Run" order="2" />
...@@ -382,6 +453,7 @@ ...@@ -382,6 +453,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<window_info anchor="bottom" id="Version Control" order="7" /> <window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
...@@ -398,6 +470,13 @@ ...@@ -398,6 +470,13 @@
<window_info anchor="bottom" id="Python Console" order="10" /> <window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37 >>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
=======
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.62171054" />
<window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
>>>>>>> ba9edd82277593cb1c9462ab1af75927c39b4b12
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
...@@ -490,6 +569,7 @@ ...@@ -490,6 +569,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/gaia/settings_local.py"> <entry file="file://$PROJECT_DIR$/gaia/settings_local.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="179"> <state relative-caret-position="179">
<caret line="52" column="23" selection-start-line="52" selection-start-column="23" selection-end-line="52" selection-end-column="23" /> <caret line="52" column="23" selection-start-line="52" selection-start-column="23" selection-end-line="52" selection-end-column="23" />
</state> </state>
...@@ -585,6 +665,10 @@ ...@@ -585,6 +665,10 @@
<folding> <folding>
<element signature="e#1265#5226#0" /> <element signature="e#1265#5226#0" />
</folding> </folding>
=======
<state relative-caret-position="104">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
>>>>>>> ba9edd82277593cb1c9462ab1af75927c39b4b12
</state> </state>
</provider> </provider>
</entry> </entry>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment