Merge branch 'master' of https://github.com/nerosketch/djing

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "djing_flow"]
+	path = agent/netflow/djing_flow
+	url = git://github.com/nerosketch/djing_flow.git

djing/settings_example.py

@@ -87,13 +87,13 @@ WSGI_APPLICATION = 'djing.wsgi.application'
 
 DATABASES = {
     'default': {
-        # 'ENGINE': 'django.db.backends.sqlite3',
-        #'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'djingdb',
-        'USER': 'USER',  # You can change the user name
-        'PASSWORD': 'PASSWORD',  # You can change the password
-        'HOST': 'localhost'
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        #'ENGINE': 'django.db.backends.mysql',
+        #'NAME': 'djingdb',
+        #'USER': 'USER',  # You can change the user name
+        #'PASSWORD': 'PASSWORD',  # You can change the password
+        #'HOST': 'localhost'
     }
 }