From 9658f3e5ee6325de85f4d4abbedec3668fbe04fe Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Sat, 9 Mar 2013 10:59:57 +0400
Subject: [PATCH] .mailmap has been added

---
 .mailmap    |  4 ++++
 bin/eho-api | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..a28eacbe
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+Sergey Lukjanov <slukjanov@mirantis.com> <me@frostman.ru>
diff --git a/bin/eho-api b/bin/eho-api
index 555e19e7..55ce288e 100755
--- a/bin/eho-api
+++ b/bin/eho-api
@@ -1,4 +1,20 @@
 #!/usr/bin/env python
+
+# Copyright (c) 2013 Mirantis Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import argparse
 
 import eho.server.main as server