Merge pull request #578 from cloudify-cosmo/3.2.4-build

3.2.4 build

.drp/trufflehog_config.yml

@@ -4,9 +4,10 @@ project_exclusion_list:
     - .drp
     - .github
     - examples
+    - cloudify_aws/s3/tests
   #   - test
   #   - jenkins
   #   - buildroot
   #   - buildroot
-  # exclusion_file_paths:
-  #   - package/tpm2-tools/tpm2-tools.hash
+  exclusion_file_paths:
+    - Makefile

CHANGELOG.txt

@@ -1,3 +1,4 @@
+3.2.4: NE-11404-plugins-and-blueprints-employ-invalid-YAML-merge & update of pycryptodome.
 3.2.3: NE-12058-client-config-LoginProfile 
 3.2.2: NE-10823-aws-VpnGatewayLimitExceeded.
 3.2.1: RND-1195 Add Subnet placement logic.

Makefile

@@ -1,12 +1,12 @@
 download:
 ifeq (,$(wildcard ./fusion-agent))
-	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-agent.git && cd './fusion-agent' && git checkout rel/magicp1-2.0.0 && cd ..
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-agent.git && cd './fusion-agent' && git checkout master && cd ..
 endif
 ifeq (,$(wildcard ./fusion-common))
-	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-common.git && cd './fusion-common' && git checkout rel/magicp1-2.0.0 && cd ..
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-common.git && cd './fusion-common' && git checkout master && cd ..
 endif
 ifeq (,$(wildcard ./fusion-manager))
-	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-manager.git && cd './fusion-manager' && git checkout rel/magicp1-2.0.0 && cd ..
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-manager.git && cd './fusion-manager' && git checkout master && cd ..
 endif
 ifeq (,$(wildcard ./cloudify-utilities-plugins-sdk))
 	git clone https://github.com/cloudify-incubator/cloudify-utilities-plugins-sdk.git && cd './cloudify-utilities-plugins-sdk' && git checkout fusion && cd ..

cloudify_aws/__version__.py

@@ -1 +1 @@
-version = '3.2.3'
+version = '3.2.4'