This reverts commit c0711f2cb989facd60430ab18c5b0e59a1f279ac.
Signed-off-by: Stephen Shirley <[email protected]>
---
Cluster merge now works again.
tools/cluster-merge | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/tools/cluster-merge b/tools/cluster-merge
index 85d3a1d..46311b7 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
@@ -492,9 +492,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:
--
1.7.3.1
