From 922307823707e92b2f3822e702238f32f429f89e Mon Sep 17 00:00:00 2001
From: bmh2git <benjamin.harristhal@centurylink.com>
Date: Fri, 4 Dec 2015 10:21:32 -0600
Subject: [PATCH 1/7] updating poms for 1.1.2-SNAPSHOT development

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3353818..fd99b5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ctlts</groupId>
 	<artifactId>clc-ansible-module</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<name>clc-ansible-module</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From d7326bc359631804d3a7eca8668d2efd67ebaeb7 Mon Sep 17 00:00:00 2001
From: bmh2git <benjamin.harristhal@centurylink.com>
Date: Fri, 4 Dec 2015 10:21:39 -0600
Subject: [PATCH 2/7] updating develop poms to master versions to avoid merge
 conflicts

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd99b5c..570f9c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ctlts</groupId>
 	<artifactId>clc-ansible-module</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>1.1.1</version>
 	<name>clc-ansible-module</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 975cda6297af3ccf005d0394338aa0f9d342cffd Mon Sep 17 00:00:00 2001
From: bmh2git <benjamin.harristhal@centurylink.com>
Date: Fri, 4 Dec 2015 10:21:40 -0600
Subject: [PATCH 3/7] Updating develop poms back to pre merge state

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 570f9c4..fd99b5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ctlts</groupId>
 	<artifactId>clc-ansible-module</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.2-SNAPSHOT</version>
 	<name>clc-ansible-module</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 36b7dd38eceb2c24a0aee5f85a92434e9a53cf3a Mon Sep 17 00:00:00 2001
From: jwcolbert <justin.wcolbert@gmail.com>
Date: Fri, 4 Dec 2015 10:33:12 -0600
Subject: [PATCH 4/7] updated dependency

---
 build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.py b/build.py
index ec7568b..8cb49dd 100644
--- a/build.py
+++ b/build.py
@@ -55,7 +55,7 @@ def initialize( project ):
 	project.get_property('filter_resources_glob').append('**/clc_ansible_module/*.py')
 	# ----------------
 	# install clc-sdk during installation
-	project.depends_on("clc-sdk", "==2.29")
+	project.depends_on("clc-sdk", "==2.37")
 	# ----------------
 	# execute some installation scripts
 	project.set_property('dir_source_main_scripts', 'src/main/python')

From 29fb7f692df93c473bd95ae3d1aef9eb015b1dfe Mon Sep 17 00:00:00 2001
From: jwcolbert <justin.wcolbert@gmail.com>
Date: Fri, 4 Dec 2015 12:34:11 -0600
Subject: [PATCH 5/7] Removed erroneous comments

---
 src/main/python/clc_inv.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/python/clc_inv.py b/src/main/python/clc_inv.py
index 662243f..e138ed7 100755
--- a/src/main/python/clc_inv.py
+++ b/src/main/python/clc_inv.py
@@ -71,8 +71,8 @@ def print_inventory_json():
     groups = _find_all_groups()
     servers = _get_servers_from_groups(groups)
     hostvars = _find_all_hostvars_for_servers(servers)
-#    dynamic_groups = _build_hostvars_dynamic_groups(hostvars)
-#    groups.update(dynamic_groups)
+    dynamic_groups = _build_hostvars_dynamic_groups(hostvars)
+    groups.update(dynamic_groups)
 
     result = groups
     result['_meta'] = hostvars

From 736ba0f445b3673ee38b2e0098a5fadaf020ad52 Mon Sep 17 00:00:00 2001
From: jwcolbert <justin.wcolbert@gmail.com>
Date: Fri, 4 Dec 2015 12:35:18 -0600
Subject: [PATCH 6/7] Updating version number

---
 build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.py b/build.py
index 8cb49dd..34bc265 100644
--- a/build.py
+++ b/build.py
@@ -28,7 +28,7 @@
 
 # define project level attributes:
 name = 'clc-ansible-module'
-version = '1.1.1'
+version = '1.1.2'
 summary = "Centurylink Cloud Ansible Modules"
 description = "Ansible extension modules which allow users to interact with Centurylink Cloud to define and manage cloud components."
 authors = [Author ("CenturyLink Cloud", "WFAAS-LLFT@centurylink.com")]

From da8ff8d35e6c09480effb893f44883dd6c5f84f2 Mon Sep 17 00:00:00 2001
From: bmh2git <benjamin.harristhal@centurylink.com>
Date: Fri, 4 Dec 2015 12:37:39 -0600
Subject: [PATCH 7/7] updating poms for branch'release-1.1.2' with non-snapshot
 versions

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd99b5c..bbaa03b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ctlts</groupId>
 	<artifactId>clc-ansible-module</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>1.1.2</version>
 	<name>clc-ansible-module</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>