From 506e33964a5079aab39cac9fce5152ff98365525 Mon Sep 17 00:00:00 2001
From: Sushil Kumar <sushil.kumar2@globallogic.com>
Date: Thu, 12 Dec 2013 19:32:59 +0000
Subject: [PATCH] Fixes .gitignore

Reasons:
- There were multiple gitignore files in repository.

Changes:
- All files merged into single .gitignore.
- log files are now covered by *.log so no separate log names needed.

Change-Id: Ia7fb4d925669cf92ceed6706e770e66ea87f5b81
Closes-Bug: #1260461
---
 .gitignore             | 11 +++++++++--
 report/.gitignore      |  2 --
 report/logs/.gitignore |  1 -
 scripts/.gitignore     | 10 ----------
 4 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 report/.gitignore
 delete mode 100644 report/logs/.gitignore
 delete mode 100644 scripts/.gitignore

diff --git a/.gitignore b/.gitignore
index afaa3bd5..0f0e2f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 *.sublime-project
 *.sublime-workspace
 scripts/.screenrc
-run_tests.log
-host-syslog.log
 scripts/test-def.conf
 .tox
 *.pyc
@@ -13,3 +11,12 @@ scripts/.cache/
 scripts/.cinderclient/
 scripts/.mysql_history
 scripts/.troveclient/
+conf.json
+Vagrantfile
+.my.cnf
+.vagrant
+.bash_history
+.rnd
+options.rc
+.novaclient
+*.log
diff --git a/report/.gitignore b/report/.gitignore
deleted file mode 100644
index cfce1ade..00000000
--- a/report/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-
diff --git a/report/logs/.gitignore b/report/logs/.gitignore
deleted file mode 100644
index 397b4a76..00000000
--- a/report/logs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.log
diff --git a/scripts/.gitignore b/scripts/.gitignore
deleted file mode 100644
index 6f74b1af..00000000
--- a/scripts/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-conf.json
-Vagrantfile
-.my.cnf
-.vagrant
-.bash_history
-.rnd
-host-syslog.log
-run_tests.log
-options.rc
-.novaclient