escapewindow

#!/usr/bin/env python

import sys
import build_utils_common as buc

osnames = ["centos5", "centos6", "sles11sp1", "suse11sp3", "debian6"]

s3_base_url = "s3://dev.hortonworks.com/HDP/"
nfs_base_url = "/mnt/RELENG-REPO-MOUNTPOINT/dev.hortonworks.com/HDP/"
http_s3_base_url = "http://s3.amazonaws.com/dev.hortonworks.com/HDP/"

escapewindow

diff --git a/roles/windows-slaves/tasks/install_cmake.yml b/roles/windows-slaves/tasks/install_cmake.yml
index a8cde77..03e1878 100644
--- a/roles/windows-slaves/tasks/install_cmake.yml
+++ b/roles/windows-slaves/tasks/install_cmake.yml
@@ -1,5 +1,5 @@
 - name: Install_CMake | Check for CMake 2.8.9
-  win_stat: path=c:\horton\CMake2.8
+  win_stat: path=c:\horton\tools\cmake-2.8.9-win32-x86
   register: cmake_dir
   tags: install_cmake

escapewindow

diff --git a/winpkg/src/scripts/InstallApi.psm1 b/winpkg/src/scripts/InstallApi.psm1
index aef460f..190a357 100644
--- a/winpkg/src/scripts/InstallApi.psm1
+++ b/winpkg/src/scripts/InstallApi.psm1
@@ -293,7 +293,7 @@ function Uninstall(

         Write-Log "Uninstalling Apache hcatalog $FinalName"
         ### $installToDir: the directory that contains the application, after unzipping
-        $installToDir = Join-Path  $env:HIVE_HOME "$FinalName"
+        $installToDir = "$ENV:HCAT_HOME"

escapewindow

diff --git a/winpkg/src/scripts/InstallApi.psm1 b/winpkg/src/scripts/InstallApi.psm1
index 2ae3235..f91aeda 100644
--- a/winpkg/src/scripts/InstallApi.psm1
+++ b/winpkg/src/scripts/InstallApi.psm1
@@ -42,13 +42,7 @@ function Install(
         $component,
         [String]
         [Parameter( Position=1, Mandatory=$true )]
-        $nodeInstallRoot,
-        [System.Management.Automation.PSCredential]

escapewindow

diff --git a/src/packages/win/scripts/InstallApi.psm1 b/src/packages/win/scripts/InstallApi.psm1
index 5c0f29a..0df2c5f 100644
--- a/src/packages/win/scripts/InstallApi.psm1
+++ b/src/packages/win/scripts/InstallApi.psm1
@@ -45,7 +45,7 @@ function Install(
     [Parameter( Position=1, Mandatory=$true )]
     $nodeInstallRoot,
     [System.Management.Automation.PSCredential]
-    [Parameter( Position=2, Mandatory=$false )]
+    [Parameter( Position=2, Mandatory=$true )]

escapewindow

diff --git a/winpkg/src/scripts/InstallApi.psm1 b/winpkg/src/scripts/InstallApi.psm1
index e3cf24b..957a531 100644
--- a/winpkg/src/scripts/InstallApi.psm1
+++ b/winpkg/src/scripts/InstallApi.psm1
@@ -287,18 +287,19 @@ function Uninstall(

         ###
         ### Removing HIVE_HOME environment variable
         ###
         Write-Log "Removing ENV:HIVE_HOME, ENV:HIVE_OPTS at machine scope"

escapewindow

diff --git a/HDP_variables.sh b/HDP_variables.sh
index 073d18d..a77683d 100644
--- a/HDP_variables.sh
+++ b/HDP_variables.sh
@@ -117,7 +117,7 @@ modules_centos5=${modules_centos5:-zookeeper hadoop hadooplzo accumulo hbase tez
 modules_suse11=${modules_suse11:-zookeeper hadoop hadooplzo accumulo hbase tez calcite hive pig kafka datafu storm sqoop oozie flume phoenix slider knox mahout falcon hue ranger}
 modules_ubuntu12=${modules_ubuntu12:-zookeeper hadoop hadooplzo accumulo hbase tez calcite hive pig kafka datafu storm sqoop oozie flume phoenix slider knox mahout falcon ranger}
 modules_debian6=${modules_ubuntu12}
-windows_modules="Monarch microsoft-sqoop-connector snappy-dll headnode-HA-monarch hadoop-lzo ranger"
+windows_modules="Monarch microsoft-sqoop-connector snappy-dll headnode-HA-monarch hadoop-lzo ranger eventhubspout-monarch"

escapewindow

diff --git a/pgpy/types.py b/pgpy/types.py
index 2cc4320..0287e0e 100644
--- a/pgpy/types.py
+++ b/pgpy/types.py
@@ -224,13 +224,18 @@ class PGPObject(six.with_metaclass(abc.ABCMeta, object)):
         return i.to_bytes(blen, order)

     @staticmethod
-    def text_to_bytes(text):
+    def text_to_bytes(text, encoding='utf-8'):

escapewindow

diff --git a/pgpy/types.py b/pgpy/types.py
index 2cc4320..62d69fb 100644
--- a/pgpy/types.py
+++ b/pgpy/types.py
@@ -224,18 +224,33 @@ class PGPObject(six.with_metaclass(abc.ABCMeta, object)):
         return i.to_bytes(blen, order)

     @staticmethod
-    def text_to_bytes(text):
+    def char_to_bytes(c, bin):

escapewindow

diff --git a/pgpy/pgp.py b/pgpy/pgp.py
index 89ff7f6..7d38f45 100644
--- a/pgpy/pgp.py
+++ b/pgpy/pgp.py
@@ -852,11 +852,13 @@ class PGPMessage(PGPObject, Armorable):
         :type sensitive: ``bool``
         :keyword compression: Set the compression algorithm for the new message.
                               Defaults to :py:obj:`CompressionAlgorithm.ZIP`. Ignored if cleartext is True.
+        :keyword encoding: if message is unicode or str, this is the encoding of the message
         """