modified for release branch merge conflict

diff --git a/packaging_eventinjector_wac.sh b/packaging_eventinjector_wac.sh
index f2a38d4..72ddc0e 100755 (executable)
--- a/packaging_eventinjector_wac.sh
+++ b/packaging_eventinjector_wac.sh
@@ -31,6 +31,7 @@ package()
 
        current_date=`date +%Y%m%d`
        upload_server=172.21.111.180
+       upload_directory=/packages/${current_date}_PACKAGES_${upload_platform_name}
        case $2 in
                master)
                        upload_directory=/packages/PACKAGES_${upload_platform_name}