summaryrefslogtreecommitdiffstats
path: root/test-scheduler/.gitignore
diff options
context:
space:
mode:
authorYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-09-04 21:02:27 +0800
committerYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-09-06 14:58:45 +0800
commite32043f58a2450b6a5986dc2a01f64f8b22c3992 (patch)
tree650f6ce0381e53c3ca935025e9121f06725efd5d /test-scheduler/.gitignore
parenta09bbea983aca3e437e254566da98196177748d9 (diff)
Change naming and veriy test-scheduler function
Changes: 1. Testing-scheduler -> Test-scheduler 2. lots of windows breaks '\r' and '^M' in files, batch changes to unix breaks '$' 3. Add ui/build Change-Id: I1f2c98ab9348460d4e68bfbfab664dae82b761ba Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
Diffstat (limited to 'test-scheduler/.gitignore')
-rw-r--r--test-scheduler/.gitignore70
1 files changed, 70 insertions, 0 deletions
diff --git a/test-scheduler/.gitignore b/test-scheduler/.gitignore
new file mode 100644
index 00000000..d1dab789
--- /dev/null
+++ b/test-scheduler/.gitignore
@@ -0,0 +1,70 @@
+<<<<<<< HEAD:testing-scheduler/.gitignore
+#################################
+## files in server directory
+#################################
+
+# PYTHON PYC FILE
+/server/**/*.pyc
+
+#############################################################
+
+
+#################################
+## files in ui directory
+#################################
+/ui/.DS_Store
+/ui/node_modules/
+/ui/dist/
+/ui/npm-debug.log*
+/ui/yarn-debug.log*
+/ui/yarn-error.log*
+
+# Editor directories and files
+/ui/.idea
+/ui/.vscode
+/ui/*.suo
+/ui/*.ntvs*
+/ui/*.njsproj
+/ui/*.sln
+
+!/ui/build
+#################################
+## files in docker directory
+#################################
+/docker/plugin/tmp_files/
+/docker/ui/dist/
+=======
+#################################
+## files in server directory
+#################################
+
+# PYTHON PYC FILE
+/server/**/*.pyc
+
+#############################################################
+
+
+#################################
+## files in ui directory
+#################################
+/ui/.DS_Store
+/ui/node_modules/
+/ui/dist/
+/ui/npm-debug.log*
+/ui/yarn-debug.log*
+/ui/yarn-error.log*
+
+# Editor directories and files
+/ui/.idea
+/ui/.vscode
+/ui/*.suo
+/ui/*.ntvs*
+/ui/*.njsproj
+/ui/*.sln
+
+#################################
+## files in docker directory
+#################################
+/docker/plugin/tmp_files/
+/docker/ui/dist/
+>>>>>>> Change naming and veriy test-scheduler function:test-scheduler/.gitignore