14.1.1-15 baseline

Former-commit-id: cb8eca2a0dfc0e2348301e8d9932db824ecaf34c

cave/build/static/common/cave/etc/gfe/userPython/utilities/TkDefaults.py

@@ -2,7 +2,7 @@
 from com.raytheon.viz.gfe import GFEPreference
 
 Options = [
-            ('*visual',                             'truecolor'),
+#            ('*visual',                             'truecolor'),
             ('*background' ,                        'gray65'),
             ('*activeBackground' ,                  'gray83'),
             ('*blinkingHighlightColor' ,            'CornSilk'),

edexOsgi/build.edex/esb/conf/modes.xml

@@ -239,6 +239,7 @@
 		<include>fssobs-ingest.xml</include>
 		<include>fssobs-common.xml</include>
 		<include>ldadmesonet-common.xml</include>
+		<include>manualIngest-common.xml</include>
 		<include>dataaccess-common.xml</include>
 		<exclude>ncgrib-common.xml</exclude>
 		<exclude>nctext-common.xml</exclude>

edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/mergeGrid.py

@@ -233,7 +233,7 @@ class MergeGrid:
         # merge the grids
         if gridA is not None:
             mask = numpy.not_equal(gridA[0], self.__inFillV)
-            numpy.logical_and(mask, self.__areaMask)
+            numpy.logical_and(mask, self.__areaMask, mask)
 
             if gridB is None:   #make an empty grid
                 noKeys = []

nativeLib/files.native/awipsShare/hydroapps/whfs/bin/start_fcstservice

@@ -19,5 +19,6 @@ export CLASSPATH=$DB_DRIVER_PATH
 CLASSPATH=$CLASSPATH:$WHFS_BIN_DIR/fcstservice.jar
 
 #Execute Lhvm
+unset GNOME_DESKTOP_SESSION_ID
 xterm -T "fcstservice" -iconic \
 -e $SYS_JAVA_DIR/bin/java ohd.hseb.fcstservice.LhvmApplicationWindow $JDBCURL &

rpms/build/x86_64/build.sh

@@ -412,13 +412,13 @@ if [ "${1}" = "-viz" ]; then
    #buildRPM "awips2-common-base"
    #buildRPM "awips2-python-dynamicserialize"
    #buildRPM "awips2-python"
-   #buildRPM "awips2-adapt-native"
+   buildRPM "awips2-adapt-native"
    #unpackHttpdPypies
    #if [ $? -ne 0 ]; then
    #   exit 1
    #fi
    #buildRPM "awips2-httpd-pypies"
-   #buildRPM "awips2-hydroapps-shared"
+   buildRPM "awips2-hydroapps-shared"
    #buildRPM "awips2-rcm"
    #buildRPM "awips2-tools"
    #buildRPM "awips2-cli"