xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1

Browse source 
Former-commit-id: b0d4a3006b [formerly bb60b170e8] [formerly dcab909b4b] [formerly 7fc256d076 [formerly dcab909b4b [formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]]]
Former-commit-id: 7fc256d076
Former-commit-id: c01a747187af151b3885060aa9f39b3a286b4c75 [formerly a499624f5f]
Former-commit-id: 1f9f0ba7f3
This commit is contained in:
Nate Jensen 2014-06-17 17:01:46 -05:00 • committed by Gerrit Code Review
commit d6612e027e
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/build/static/linux/cave/cave.sh
View file

@ -233,11 +233,8 @@ curTime=`date +%Y%m%d_%H%M%S`
shift
done
# Special instructions for the 64-bit jvm.
ARCH_ARGS=""
if [ -f /awips2/java/jre/lib/amd64/server/libjvm.so ]; then
ARCH_ARGS="-vm /awips2/java/jre/lib/amd64/server/libjvm.so"
fi
# Eclipse recommends explicitly setting the JVM to use
ARCH_ARGS="-vm /awips2/java/bin/java"
lookupINI "${USER_ARGS[@]}"

2
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
View file

@ -51,7 +51,7 @@ usage() {
echo " The servers to grab top information from, make sure list is quoted and space delimited"
echo
echo -e "-d {y/n}\t\tdefault [$RUN_JMAP]"
echo " Run jmap to grab the head dump information"
echo " Run jmap to grab the heap dump information"
echo
echo -e "-e {request/ingest/ingestGrib/ingestDat}"
echo " Run edex mode and grab information about the jvm passed. May be used multiple times to grab data about multiple jvms"