From 339d1ccc8b7f89f5580e755b1f8bcc703951fba5 Mon Sep 17 00:00:00 2001
From: Brian Coca <brian.coca+git@gmail.com>
Date: Tue, 4 Nov 2014 20:54:55 -0500
Subject: [PATCH] fixed issue with subclasses across the repos clobbering each
 other, they now merge

---
 hacking/module_formatter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hacking/module_formatter.py b/hacking/module_formatter.py
index 73c3045479d..04f098fc984 100755
--- a/hacking/module_formatter.py
+++ b/hacking/module_formatter.py
@@ -135,7 +135,7 @@ def list_modules(module_dir, depth=0):
                 res = list_modules(d, depth + 1)
                 for key in res.keys():
                     if key in categories:
-                        categories[key].update(res[key])
+                        categories[key] = ansible.utils.merge_hash(categories[key], res[key])
                         res.pop(key, None)
 
                 if depth < 2: