From 3d8f154f1863291dfd14793f45515e8996e25563 Mon Sep 17 00:00:00 2001
From: Stephen Shirley <diamond@google.com>
Date: Thu, 10 Feb 2011 17:32:26 +0100
Subject: [PATCH] Revert "Disable the cluster-merge tool for the moment"
This reverts commit c0711f2cb989facd60430ab18c5b0e59a1f279ac.
Signed-off-by: Stephen Shirley <diamond@google.com>
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
tools/cluster-merge | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tools/cluster-merge b/tools/cluster-merge
index f2410f490..593693dc3 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -1,7 +1,7 @@
#!/usr/bin/python
#
-# Copyright (C) 2010, 2011 Google Inc.
+# Copyright (C) 2010 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -493,9 +493,6 @@ def main():
(options, args) = parser.parse_args()
- parser.error("Unfortunately this tool is currently broken and cannot"
- " be used. Sorry!")
-
SetupLogging(options)
if not args:
--
GitLab