Ron Anderson
|
8ee12d17a7
|
Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287
Former-commit-id: ff6fe9e225 [formerly 165bc6c409 ] [formerly 6557515f64 ] [formerly ff6fe9e225 [formerly 165bc6c409 ] [formerly 6557515f64 ] [formerly 08e09382db [formerly 6557515f64 [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]]]
Former-commit-id: 08e09382db
Former-commit-id: f9eeac331e [formerly 3f9cb35feb ] [formerly 844223fb2342ed488da4564f04128cde03cba0ca [formerly c3363d43fa ]]
Former-commit-id: 0f81f278f82f6fc1e74905f9388934a694727db6 [formerly b04716dd2b ]
Former-commit-id: 40b8d1ed3c
|
2013-05-30 11:01:07 -05:00 |
|
Steve Harris
|
d850ee5ce1
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 80896a4e31 [formerly 07bc6c83e9 ] [formerly 9d4577079d ] [formerly 80896a4e31 [formerly 07bc6c83e9 ] [formerly 9d4577079d ] [formerly 0a276d4954 [formerly 9d4577079d [formerly f50ef3c44d1386dd4ec800fd65db7b0f2b4fe03f]]]]
Former-commit-id: 0a276d4954
Former-commit-id: 7af97e645a [formerly f72ba834dc ] [formerly 3214e33affd1877bbc79da62569334af050c73c9 [formerly f4d1b7c86c ]]
Former-commit-id: e669fc0b287e1900b4491c0604551a6b3fadc033 [formerly 9bf53663ae ]
Former-commit-id: 86a4b2913f
|
2013-05-30 07:26:30 -05:00 |
|
Steve Harris
|
7e31d1a9a1
|
13.4.1-13 baseline
Former-commit-id: 9a7ef48967 [formerly e3b8086bd0 ] [formerly 87b9712009 ] [formerly 9a7ef48967 [formerly e3b8086bd0 ] [formerly 87b9712009 ] [formerly de476791fb [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]]
Former-commit-id: de476791fb
Former-commit-id: 70ecafa237 [formerly 418f8aef56 ] [formerly 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf ]]
Former-commit-id: 28cd3469f8ef78216f243c61430c36c1ad67dd52 [formerly c9155c1631 ]
Former-commit-id: 176f4d392f
|
2013-05-29 16:30:09 -04:00 |
|
Richard Peter
|
9845d2e8b7
|
Merge "Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period." into omaha_13.4.1
Former-commit-id: 7aec695890 [formerly 344765c61d ] [formerly 979cc8c181 ] [formerly 7aec695890 [formerly 344765c61d ] [formerly 979cc8c181 ] [formerly 732ae3c832 [formerly 979cc8c181 [formerly 09ec82babbc567bea671b606f3b45e8923c6e831]]]]
Former-commit-id: 732ae3c832
Former-commit-id: 8289c96d1c [formerly e65237b93f ] [formerly e8b165061195e5604181a03f4c2901e70131c927 [formerly ec8c77f6f3 ]]
Former-commit-id: 17ca6fde337547147fb039f0781ab9144af1853f [formerly d48c54529f ]
Former-commit-id: f3b67f0d33
|
2013-05-23 18:10:58 -05:00 |
|
Ron Anderson
|
bc0ece31ba
|
Merge "Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1
Former-commit-id: f9bedd3aec [formerly 1eb1cffa15 ] [formerly c0fffc630d ] [formerly f9bedd3aec [formerly 1eb1cffa15 ] [formerly c0fffc630d ] [formerly 57c452b085 [formerly c0fffc630d [formerly 339fa8409866f8464eebaf982cdbfc3ae37a8b6b]]]]
Former-commit-id: 57c452b085
Former-commit-id: 0462d29a0f [formerly 9cdf34184d ] [formerly 782f51d6eb68810b024cac4035d52bed928b399f [formerly 59d823bf7b ]]
Former-commit-id: f44b1ca1fcbc4a1a341f24d6e09c8b80575f1fa6 [formerly e33fd0c95f ]
Former-commit-id: 3a44fb51ca
|
2013-05-23 12:12:39 -05:00 |
|
Richard Peter
|
8d69735af5
|
Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c
Former-commit-id: cbfe9772c5 [formerly d5c0b86b7a ] [formerly b599745012 ] [formerly cbfe9772c5 [formerly d5c0b86b7a ] [formerly b599745012 ] [formerly 7349808131 [formerly b599745012 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]]]
Former-commit-id: 7349808131
Former-commit-id: d4eb77b248 [formerly 53190601f6 ] [formerly 58c6245c0b25ac72406612c59ba4ec5f003980c0 [formerly f3e0966966 ]]
Former-commit-id: 7b9c4e5c34cbc503c4e1e2d503397fafc52e7632 [formerly c51e6750b4 ]
Former-commit-id: 62191a8d82
|
2013-05-23 11:50:34 -05:00 |
|
Mike Duff
|
afc3142888
|
Issue #1902 - fix to forced guidance
Peer review comments
Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e
Former-commit-id: 44ef119c41 [formerly b331a68a08 ] [formerly 11423a7465 ] [formerly 44ef119c41 [formerly b331a68a08 ] [formerly 11423a7465 ] [formerly 2a733fa5f8 [formerly 11423a7465 [formerly ebd633109a62e7a2d8a0b8e3083aaf5680766739]]]]
Former-commit-id: 2a733fa5f8
Former-commit-id: f603c80988 [formerly 2878cde676 ] [formerly 3698ac621952b956b533e97d2a14a12f002e3478 [formerly 7d177607bf ]]
Former-commit-id: 9f4ea3bc120ccb55677c8ae5d8fce8572a9a2e4f [formerly a1dd9d73ba ]
Former-commit-id: 12bad74ca8
|
2013-05-23 09:52:07 -05:00 |
|
Steve Harris
|
32c2d3e5e9
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: df612396fb [formerly dce0dc3692 ] [formerly 097617fa26 ] [formerly df612396fb [formerly dce0dc3692 ] [formerly 097617fa26 ] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]]
Former-commit-id: 462652e31e
Former-commit-id: a6bb8b38dd [formerly 026674d0b2 ] [formerly 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202 ]]
Former-commit-id: 1b7b8110c512177341c86e9272a2b79f0ae52bbb [formerly bd9b2e493e ]
Former-commit-id: 6dbe80b1af
|
2013-05-22 16:10:04 -05:00 |
|
David Gillingham
|
6af35c977c
|
Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest.
Change-Id: Ie9e58a139eed869a0483a475974ed4b733711bac
Former-commit-id: 63ea2808eb [formerly cf1f45d77f ] [formerly 8e8d71dc2f ] [formerly 63ea2808eb [formerly cf1f45d77f ] [formerly 8e8d71dc2f ] [formerly d5895e23c7 [formerly 8e8d71dc2f [formerly d6c6f3f9a6d7d37f22af82984d0d75937b4415cc]]]]
Former-commit-id: d5895e23c7
Former-commit-id: 82e61b31f6 [formerly 2e6f7c8250 ] [formerly 1cd8a6a6ca2d726353932c69d7adfc7def2761c1 [formerly 0e1135ac1f ]]
Former-commit-id: f07ebe70943583bbe914ac2937013617e62bb895 [formerly 135ed9899f ]
Former-commit-id: 8706da5f02
|
2013-05-22 15:48:32 -05:00 |
|
Steve Harris
|
cf67535a3a
|
13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a ] [formerly 6a97b4325a ] [formerly 623f813923 [formerly 397bbf674a ] [formerly 6a97b4325a ] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: fb41995981 [formerly b745b332ae ] [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859 ]]
Former-commit-id: 0563320c3a39f9ddb056e9b1876ed4108f818501 [formerly 0d9e71aee2 ]
Former-commit-id: 71e13c4d4d
|
2013-05-22 16:42:39 -04:00 |
|
David Gillingham
|
77ccf79293
|
Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80
Former-commit-id: 511098fffd [formerly 2555cf9819 ] [formerly 5cba0f5e40 ] [formerly 511098fffd [formerly 2555cf9819 ] [formerly 5cba0f5e40 ] [formerly 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]]
Former-commit-id: 801c659108
Former-commit-id: 60850d6f8a [formerly 1471a7fa34 ] [formerly 7464c78970ff1efe18387d6d2105db0eb2e2d4ad [formerly 60aeb71652 ]]
Former-commit-id: d28086240a58a1bd453231bbbeda47190441083b [formerly dca867b77c ]
Former-commit-id: 016ea4ec14
|
2013-05-22 11:42:08 -05:00 |
|
Richard Peter
|
27c6d6f318
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c40709229f [formerly 4809b3c15b ] [formerly 73372622f7 ] [formerly c40709229f [formerly 4809b3c15b ] [formerly 73372622f7 ] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 8e252f89f0 [formerly 21b87e9ea7 ] [formerly 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878 ]]
Former-commit-id: 7abbd80f0599361a183f199c4e0c507ff370195e [formerly 69e6ea4847 ]
Former-commit-id: 2a8115770f
|
2013-05-21 10:35:00 -05:00 |
|
Steve Harris
|
603bc2535a
|
13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6 ] [formerly 2edee36158 ] [formerly 65d8f51034 [formerly d6319a2ca6 ] [formerly 2edee36158 ] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 5db95cce55 [formerly 4d88863515 ] [formerly d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48 ]]
Former-commit-id: b076884dd48bff50b64587e186d178820fa5b5cf [formerly 2767fd893c ]
Former-commit-id: d9f967c811
|
2013-05-21 09:19:25 -04:00 |
|
Steve Harris
|
0b9bf76434
|
13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8 ] [formerly 9a403b3615 ] [formerly 294c127b0a [formerly 68fe2134b8 ] [formerly 9a403b3615 ] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]]
Former-commit-id: 92152778b9
Former-commit-id: ac83fff244 [formerly 7e04d8cd13 ] [formerly 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b ]]
Former-commit-id: 3963e7aafef444157e59ab93198e8eb33ab5acb5 [formerly 322036ea82 ]
Former-commit-id: b41118326c
|
2013-05-20 10:52:47 -04:00 |
|
Bryan Kowal
|
d21a109185
|
Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
Former-commit-id: dd508d5bdd [formerly db9b06cc9d ] [formerly d8ce0f369c ] [formerly dd508d5bdd [formerly db9b06cc9d ] [formerly d8ce0f369c ] [formerly a070d28ecc [formerly d8ce0f369c [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]]
Former-commit-id: a070d28ecc
Former-commit-id: 1e095fc20b [formerly a52363e2df ] [formerly 6bbd21751b1aa7bfaacb409592f0ad2110b3d569 [formerly 7dd9b1e1c0 ]]
Former-commit-id: f8879e22ec690c4bfa0a9df5cebb8a03091ee44b [formerly bef3b4c74f ]
Former-commit-id: 7425d2c695
|
2013-05-17 18:21:03 -05:00 |
|
Steve Harris
|
721e568859
|
Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Former-commit-id: f9535abb10 [formerly 87a31f9990 ] [formerly 16ba74496d ] [formerly f9535abb10 [formerly 87a31f9990 ] [formerly 16ba74496d ] [formerly b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]]
Former-commit-id: b76d359695
Former-commit-id: 9b898a6478 [formerly b5d3ff1867 ] [formerly 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615 ]]
Former-commit-id: da72fecb259457811b70cacd5d31fd4a085b41bd [formerly 4827d8f1d9 ]
Former-commit-id: 34145afafe
|
2013-05-16 13:45:58 -05:00 |
|
Bryan Kowal
|
aeb613c15a
|
Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e
Former-commit-id: 443fa1a125 [formerly 2149099abb ] [formerly 11c93f548e ] [formerly 443fa1a125 [formerly 2149099abb ] [formerly 11c93f548e ] [formerly 43ec909008 [formerly 11c93f548e [formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]]]
Former-commit-id: 43ec909008
Former-commit-id: fd6dec8c03 [formerly c03d61587c ] [formerly 134ed31084c1662f1e828cda0c3059ae2bb2adf0 [formerly 97cff7bf9c ]]
Former-commit-id: a21d8164befd41b2d10f7277f6d82ce49c175f8b [formerly c00e145831 ]
Former-commit-id: fc9f89b497
|
2013-05-16 10:21:11 -05:00 |
|
Bryan Kowal
|
6c802f2f8f
|
Issue #1872 - merge 2002; do not include .gitignore files in the rpm
Former-commit-id: 34c87d5256 [formerly c83d93b527 ] [formerly b0122e794e ] [formerly 34c87d5256 [formerly c83d93b527 ] [formerly b0122e794e ] [formerly 20fd227d99 [formerly b0122e794e [formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]]]
Former-commit-id: 20fd227d99
Former-commit-id: c7cd48449e [formerly 8cba03d5a5 ] [formerly 125acc649473b68c049da6f9fe45530d4b3c3030 [formerly 7ec8600dc1 ]]
Former-commit-id: 544d3bcd094256f30ba8444207c705fdab78b2e9 [formerly 1a63d07768 ]
Former-commit-id: c7a9750841
|
2013-05-16 10:19:31 -05:00 |
|
Steve Harris
|
202e373f01
|
13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa ] [formerly bcf7f15c90 ] [formerly 301821988e [formerly 88eee9cbfa ] [formerly bcf7f15c90 ] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]]
Former-commit-id: aff41713f9
Former-commit-id: 7d55d0e959 [formerly 67a95d07d2 ] [formerly b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd ]]
Former-commit-id: a7c4bec32a032d07ef14566103e744b20ea31401 [formerly 3f87ea1a15 ]
Former-commit-id: 1730b6c41e
|
2013-05-16 11:12:07 -04:00 |
|
Nate Jensen
|
6e45b336f4
|
Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: 058e32d421 [formerly bb307ed685 ] [formerly 35830d317d ] [formerly 058e32d421 [formerly bb307ed685 ] [formerly 35830d317d ] [formerly 7f9ef5ce98 [formerly 35830d317d [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]]]
Former-commit-id: 7f9ef5ce98
Former-commit-id: 686ad54de8 [formerly dbe24d00fd ] [formerly 209109c17ddec84f38f3a259f5a4ad89242e92a2 [formerly 4c7b2d73d3 ]]
Former-commit-id: a96962f665d2ea927846a46196bb65a6522c5117 [formerly f7d304c51b ]
Former-commit-id: 921d851ef1
|
2013-05-15 14:00:15 -05:00 |
|
Nate Jensen
|
df8ba5e468
|
Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b
Former-commit-id: a0b1b9053a [formerly 86d3bf5a7c ] [formerly 948e47a2c6 ] [formerly a0b1b9053a [formerly 86d3bf5a7c ] [formerly 948e47a2c6 ] [formerly fecadf104b [formerly 948e47a2c6 [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]]]
Former-commit-id: fecadf104b
Former-commit-id: 4b07083989 [formerly 9284c27ddd ] [formerly 45cf8bb5f9314dc1648e43987c8690bb4bf5a8d8 [formerly ba3bda461c ]]
Former-commit-id: f836946e3fef029e11cd62cfcf8a2d315d6b7042 [formerly 43369f0cf3 ]
Former-commit-id: 351989c61f
|
2013-05-15 13:36:09 -05:00 |
|
Bryan Kowal
|
1af23d1007
|
Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
Former-commit-id: e02ad5d555 [formerly e1794dd03f ] [formerly f9e77e90b7 ] [formerly e02ad5d555 [formerly e1794dd03f ] [formerly f9e77e90b7 ] [formerly 0e3e3e891b [formerly f9e77e90b7 [formerly 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92]]]]
Former-commit-id: 0e3e3e891b
Former-commit-id: 92db4c4121 [formerly 1fccd55036 ] [formerly 464ade86d03b34790349312571541113105fb8b1 [formerly 0af34bbe4c ]]
Former-commit-id: 8ef173c2c91f802120c2e4ce175ee6de5edcfcc9 [formerly 59024f8dd7 ]
Former-commit-id: 84ed22cf52
|
2013-05-15 11:55:56 -05:00 |
|
Steve Harris
|
4b1a9ad438
|
13.4.1-8 baseline
Former-commit-id: 02dba50c00 [formerly 576a74fe0b ] [formerly 19866e7032 ] [formerly 02dba50c00 [formerly 576a74fe0b ] [formerly 19866e7032 ] [formerly c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]]
Former-commit-id: c59b52a266
Former-commit-id: fddef92bf3 [formerly 5465764527 ] [formerly c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39 ]]
Former-commit-id: 39606e2ce74e5380d44e132dd22716b3b06b5051 [formerly 395d21565f ]
Former-commit-id: 5bdcf5c0a1
|
2013-05-14 09:21:41 -04:00 |
|
Richard Peter
|
6caff6bdf6
|
Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea
Former-commit-id: 31a84fb91f [formerly c63a4882e7 ] [formerly 99391cfe12 ] [formerly 31a84fb91f [formerly c63a4882e7 ] [formerly 99391cfe12 ] [formerly d4135dba62 [formerly 99391cfe12 [formerly 883a51484d03900852ed84820aa559e088c97335]]]]
Former-commit-id: d4135dba62
Former-commit-id: 2813a8fc47 [formerly 43a90c062c ] [formerly adfd41ab237c568aeecc21759b668b8afa0b7822 [formerly a02955e40c ]]
Former-commit-id: a8522f4158313026efd8946f1eccafa6f78a6ff3 [formerly 81ece036ac ]
Former-commit-id: fe2e894307
|
2013-05-13 17:16:57 -05:00 |
|
Richard Peter
|
8083ef6c71
|
Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
nativeLib/files.native/adapt/climate/bin/Linux/build_f6
nativeLib/files.native/adapt/climate/bin/Linux/create_climate
nativeLib/files.native/adapt/climate/bin/Linux/display_climate
nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
nativeLib/files.native/adapt/climate/bin/Linux/format_climate
nativeLib/files.native/adapt/climate/bin/Linux/init_climate
nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
nativeLib/files.native/edex/lib/native/linux32/libXm.so
nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
nativeLib/files.native/edex/lib/native/linux32/libecpg.so
nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
nativeLib/files.native/edex/lib/native/linux32/libjasper.so
nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
nativeLib/files.native/edex/lib/native/linux32/libtcl.so
nativeLib/files.native/edex/lib/native/linux32/libtk.so
rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e
Former-commit-id: b374309faf [formerly 4ae23b93d9 ] [formerly 8062c38b71 ] [formerly b374309faf [formerly 4ae23b93d9 ] [formerly 8062c38b71 ] [formerly ba590e2f93 [formerly 8062c38b71 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]]
Former-commit-id: ba590e2f93
Former-commit-id: b2b66da141 [formerly faf22cc925 ] [formerly 845e355d3758a8223bad200d62847aef296e66cc [formerly 8e5929406c ]]
Former-commit-id: 77b1abb6a3a5f5a94bfd365fc6227f35dbc435c5 [formerly 4b5869684b ]
Former-commit-id: 9623d4c82e
|
2013-05-13 16:33:50 -05:00 |
|
Steve Harris
|
a2c35a5f3f
|
13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77 ] [formerly 4c6ff79e71 ] [formerly 81bc07bff4 [formerly 8072752c77 ] [formerly 4c6ff79e71 ] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f [formerly ff7a21ac37 ] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661 ]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc ]
Former-commit-id: c7c6ea343e
|
2013-05-13 12:58:10 -04:00 |
|
Ben Steffensmeier
|
6146cdb6a7
|
Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 1823c1850c [formerly 926da8983e ] [formerly e5fc3f3835 ] [formerly 1823c1850c [formerly 926da8983e ] [formerly e5fc3f3835 ] [formerly 598ce2ae6c [formerly e5fc3f3835 [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]]]
Former-commit-id: 598ce2ae6c
Former-commit-id: c9c011aecc [formerly bb257fc9e5 ] [formerly f1b73d9e52924ffdea1445f4fde629bcef0cc742 [formerly b4c645f99f ]]
Former-commit-id: 80fd9099ac8e1ac91feebe6357d012569d5239f4 [formerly 62db2bdcd3 ]
Former-commit-id: 85eda2ea78
|
2013-05-13 11:42:54 -05:00 |
|
Mike Duff
|
4bf51528c4
|
Issue #1919 - Fix VGBs in FFMP
Former-commit-id: 66f929fb14 [formerly d087b03eb3 ] [formerly f887a41875 ] [formerly 66f929fb14 [formerly d087b03eb3 ] [formerly f887a41875 ] [formerly 7874521269 [formerly f887a41875 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]]
Former-commit-id: 7874521269
Former-commit-id: 8fa2b8ce8c [formerly 311ce09129 ] [formerly 130559fc1d4fb0be58387838e519191858bc2120 [formerly d262dc63f0 ]]
Former-commit-id: fa578f48226237d69efec1581a00bc9a6b2069a3 [formerly 83304c3e4c ]
Former-commit-id: 3df65a2ad9
|
2013-05-10 09:58:02 -05:00 |
|
David Gillingham
|
a907e694b3
|
Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4
Former-commit-id: cb4a08c462 [formerly 11cb7b2295 ] [formerly 51063c7c53 ] [formerly cb4a08c462 [formerly 11cb7b2295 ] [formerly 51063c7c53 ] [formerly 36944298f4 [formerly 51063c7c53 [formerly 4c7f1216d9e2ba683bc46adcfe1d5863e4477490]]]]
Former-commit-id: 36944298f4
Former-commit-id: f5c173cd59 [formerly c5983413a0 ] [formerly b588bb9f2302f7ea860ccec675a0926c0b479454 [formerly d475d8f07b ]]
Former-commit-id: fc7cc38a9f948d470d1c3307c5a4bb760429465b [formerly 65e64221d5 ]
Former-commit-id: 50d58b588e
|
2013-05-09 14:28:17 -05:00 |
|
Brad Gonzales
|
552447e293
|
Issue #1970 added annotation comment to PluginDataObject header.
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52
Former-commit-id: 1268c61a9d [formerly 36345cc166 ] [formerly 90d93e2a02 ] [formerly 1268c61a9d [formerly 36345cc166 ] [formerly 90d93e2a02 ] [formerly ed59927d62 [formerly 90d93e2a02 [formerly a84978566dda2f943dff31f61c30ee286d961fd1]]]]
Former-commit-id: ed59927d62
Former-commit-id: d95850398b [formerly 41fbf12b4d ] [formerly e6289ff252c33afbb2dc87e5b8870b9c07b0db1e [formerly 877fbacffe ]]
Former-commit-id: b89f9ead8df13054e8ee03d68f1d6783f1c7ed9f [formerly 7938eea395 ]
Former-commit-id: 6421017e65
|
2013-05-09 08:05:49 -05:00 |
|
Richard Peter
|
2649d1d442
|
Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7
Former-commit-id: c2dcbedf63 [formerly ae84ced7be ] [formerly 4f3e86574b ] [formerly c2dcbedf63 [formerly ae84ced7be ] [formerly 4f3e86574b ] [formerly 697297803c [formerly 4f3e86574b [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]]]
Former-commit-id: 697297803c
Former-commit-id: 8917cc0b8d [formerly 139c234452 ] [formerly c40599aa14bfde53120b5b8c8af969cd6cc57c9e [formerly cfaeeaff5f ]]
Former-commit-id: f2f7acf2e73af54b0346602508ceed49c091f885 [formerly dfba22e206 ]
Former-commit-id: a2cfd38f6a
|
2013-05-08 17:28:01 -05:00 |
|
Ron Anderson
|
f9835c0445
|
Merge changes Id2d7981b,I094b88ed into omaha_13.4.1
* changes:
Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories
Former-commit-id: 2afb5d56d5 [formerly 0bb6152a7b ] [formerly 8a297d8e53 ] [formerly 2afb5d56d5 [formerly 0bb6152a7b ] [formerly 8a297d8e53 ] [formerly 65923ed892 [formerly 8a297d8e53 [formerly 1e94530814e28cc2a34cc92eab7164da3c3383e6]]]]
Former-commit-id: 65923ed892
Former-commit-id: 158dc49c6d [formerly 697c149281 ] [formerly 2d2f67cad9cc5373df9e82190f0bb5b4ec1bf4c4 [formerly 532c740ce4 ]]
Former-commit-id: e39946572937293f5a3ded29f96c82a4bab3612d [formerly a331ec539f ]
Former-commit-id: 78d3efbbac
|
2013-05-08 15:08:40 -05:00 |
|
Richard Peter
|
8cd64fbe06
|
Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2
Former-commit-id: 289f73d1a4 [formerly 615a1182ea ] [formerly f1f8260893 ] [formerly 289f73d1a4 [formerly 615a1182ea ] [formerly f1f8260893 ] [formerly 785b402364 [formerly f1f8260893 [formerly 9f4d4de342b45ea54e328eec47fc606f1b087473]]]]
Former-commit-id: 785b402364
Former-commit-id: 856824e025 [formerly 394018accf ] [formerly c983d21a7d9365c0fb026918dc96f3e1f5d0face [formerly 4e878364c3 ]]
Former-commit-id: cf8a0853cceb9f42683747009e5da350fb6cbbf0 [formerly 92c4c493b8 ]
Former-commit-id: a731dea1c1
|
2013-05-08 14:55:43 -05:00 |
|
Bryan Kowal
|
6333750eac
|
Issue #1982 - prefix the qpid-java rpms with awips2.
Former-commit-id: a6d15fcb3c [formerly a55331f29f ] [formerly bc39afbd24 ] [formerly a6d15fcb3c [formerly a55331f29f ] [formerly bc39afbd24 ] [formerly 4513b65ad6 [formerly bc39afbd24 [formerly 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9]]]]
Former-commit-id: 4513b65ad6
Former-commit-id: 3a2154b47a [formerly ecac3f4403 ] [formerly 03bfba28c50e2f18676d3107bbdc7bf11245386b [formerly 0c511e1d87 ]]
Former-commit-id: 6b23bce3fc1b598c28efdeab2b61a175b27f80ca [formerly 95aa897f3e ]
Former-commit-id: 145b97a88b
|
2013-05-08 14:53:29 -05:00 |
|
Richard Peter
|
feb3a74949
|
Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651
Former-commit-id: 94b56278e5 [formerly 96e2f1766c ] [formerly ff60ca76f7 ] [formerly 94b56278e5 [formerly 96e2f1766c ] [formerly ff60ca76f7 ] [formerly f59e4c9de9 [formerly ff60ca76f7 [formerly 0168cccd15ddb07988d946e3f4d719035dc63fb5]]]]
Former-commit-id: f59e4c9de9
Former-commit-id: 2de8bd116d [formerly 1174ffe848 ] [formerly c61158a43637c1f37b2c2b4fd8ccad972e074ffe [formerly 30fc52f742 ]]
Former-commit-id: f3e0e032d6a4e3348ce25d68e207ff233b7dfec9 [formerly 3129e77a4d ]
Former-commit-id: 91b98e2a00
|
2013-05-08 13:49:29 -05:00 |
|
Nate Jensen
|
caebf87da0
|
Merge "Issue #1986 optimized table sorting" into omaha_13.4.1
Former-commit-id: 10025c2174 [formerly 2ab4ae9d16 ] [formerly 48d0829957 ] [formerly 10025c2174 [formerly 2ab4ae9d16 ] [formerly 48d0829957 ] [formerly edcd6c851c [formerly 48d0829957 [formerly ed7005a317c7d5bca71370544d6f2f79e10e9dee]]]]
Former-commit-id: edcd6c851c
Former-commit-id: 879e4b54be [formerly 435ebdd199 ] [formerly c52eeb452de35110225827936c20673e78826505 [formerly c52c101f14 ]]
Former-commit-id: c895dc9b518b7d7954c4ad67bcc08324c1372151 [formerly 64fc831eb0 ]
Former-commit-id: 654ecedcb4
|
2013-05-08 13:09:59 -05:00 |
|
Nate Jensen
|
b1309f5d36
|
Issue #1986 optimized table sorting
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0
Former-commit-id: e40d94e3b1 [formerly 7eb8725c69 ] [formerly bc1d029bd4 ] [formerly e40d94e3b1 [formerly 7eb8725c69 ] [formerly bc1d029bd4 ] [formerly 8ad319d0f6 [formerly bc1d029bd4 [formerly 2b9f07f2b7eaf500d554424daa0e2740384164f1]]]]
Former-commit-id: 8ad319d0f6
Former-commit-id: c75b56f2b7 [formerly 03d798817d ] [formerly 285de642f16eea6b4024d7669a6a65b9e5969b37 [formerly 1700be8b03 ]]
Former-commit-id: 21dd458065d32edff33bf91580e0ce52979b7cfc [formerly ac747f4e02 ]
Former-commit-id: 6c69f1b82f
|
2013-05-08 13:09:17 -05:00 |
|
Nate Jensen
|
57a3a20335
|
Merge "Issue #1954 Revert HucLevelGeometriesFactory" into omaha_13.4.1
Former-commit-id: 4ba59ef95e [formerly 13201bdc1c ] [formerly cdf07833b9 ] [formerly 4ba59ef95e [formerly 13201bdc1c ] [formerly cdf07833b9 ] [formerly 02464ba2d5 [formerly cdf07833b9 [formerly 7bf591249ed0495be49813e77c6c5111c0c9b0b4]]]]
Former-commit-id: 02464ba2d5
Former-commit-id: cc894cb894 [formerly caf05c1517 ] [formerly 08f0e00c2c54baf07503d6cfe7712d237ebdea67 [formerly 39c92d85ee ]]
Former-commit-id: 8951b9e9a4490cf027ee07a37eeeb209d4fd315c [formerly d92c828191 ]
Former-commit-id: b900ff6d1e
|
2013-05-08 13:03:50 -05:00 |
|
Nate Jensen
|
4bb132ba81
|
Merge "Issue #1847 Allow painting with no Wind Data. Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c" into omaha_13.4.1
Former-commit-id: 25c86dea79 [formerly ff7cf78d17 ] [formerly 653f4b2a0d ] [formerly 25c86dea79 [formerly ff7cf78d17 ] [formerly 653f4b2a0d ] [formerly 744aaa14d6 [formerly 653f4b2a0d [formerly 129d546951798a7c839b420eb847baf1cebff2e2]]]]
Former-commit-id: 744aaa14d6
Former-commit-id: b44f864384 [formerly 078efc3112 ] [formerly 1fe3c867f713d718ffaf26f0ef56b8ce320661b4 [formerly 94f950734b ]]
Former-commit-id: e21f53dcee421e07f74982af5b8266d038c37efe [formerly 93e084e485 ]
Former-commit-id: 80d5f13244
|
2013-05-08 13:02:59 -05:00 |
|
Ben Steffensmeier
|
9b6f00c63e
|
Issue #1847 Allow painting with no Wind Data.
Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c
Former-commit-id: c653b26b26 [formerly dcf4c3cb6e ] [formerly 52845da6a8 ] [formerly c653b26b26 [formerly dcf4c3cb6e ] [formerly 52845da6a8 ] [formerly 7b96ccbf0e [formerly 52845da6a8 [formerly c4eec589218d1c1265fd596646abd9dc2322fd74]]]]
Former-commit-id: 7b96ccbf0e
Former-commit-id: b871b71dfa [formerly 5f1fcac916 ] [formerly 546c5fb066a2d3d0a153a33b16e7c62eb38a297e [formerly 5b151d48e2 ]]
Former-commit-id: 0672fc8c149572e9252e6fcd82f1aa8d586af898 [formerly 0a36658729 ]
Former-commit-id: c0d3bd1140
|
2013-05-08 12:34:46 -05:00 |
|
Ron Anderson
|
2b2eb2a4a9
|
Merge "Issue #1988: Fix iscMosaic regression caused by DR 1941." into omaha_13.4.1
Former-commit-id: 345ac8a298 [formerly dd303701a1 ] [formerly 4e63cd7a70 ] [formerly 345ac8a298 [formerly dd303701a1 ] [formerly 4e63cd7a70 ] [formerly 4b91905eaf [formerly 4e63cd7a70 [formerly 790a0c78c95414ddec13294b68905b1d7bbb60a9]]]]
Former-commit-id: 4b91905eaf
Former-commit-id: 086d8fc246 [formerly 995acbba33 ] [formerly ffafc2c173e962c618788f71949437d7c0a3a6dd [formerly 62c271f932 ]]
Former-commit-id: a5cc4b645f30b6b7b90f0ddf2147355921df7d2c [formerly 67864c9b3c ]
Former-commit-id: d017dcbebf
|
2013-05-08 12:21:28 -05:00 |
|
Ben Steffensmeier
|
e74018d1ba
|
Issue #1954 Revert HucLevelGeometriesFactory
Former-commit-id: 85326d4eb5 [formerly b323f1f266 ] [formerly dbb6e1abbf ] [formerly 85326d4eb5 [formerly b323f1f266 ] [formerly dbb6e1abbf ] [formerly 6f0fadbfbf [formerly dbb6e1abbf [formerly 0be6bba1ac6db873c54f72bdb7e267bd6cc2ce5a]]]]
Former-commit-id: 6f0fadbfbf
Former-commit-id: aa20be04ce [formerly 58668d66cb ] [formerly fa60784dabe08ae6cbe0ad79f9d2d30533bf806d [formerly 87775a876d ]]
Former-commit-id: cf9b988103fc44e6fa3a8eb22c9628729a4bae10 [formerly 10497833f4 ]
Former-commit-id: b9251e1933
|
2013-05-08 12:14:29 -05:00 |
|
Richard Peter
|
a4ed041eb9
|
Merge "Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager." into omaha_13.4.1
Former-commit-id: d2a407fe49 [formerly 05298c29be ] [formerly 9b9c19c96f ] [formerly d2a407fe49 [formerly 05298c29be ] [formerly 9b9c19c96f ] [formerly 68a83a56e0 [formerly 9b9c19c96f [formerly 54afaa408fc663ed1d88883c843ce92ee41ac0cd]]]]
Former-commit-id: 68a83a56e0
Former-commit-id: 6fc9283ead [formerly ccd08b2f59 ] [formerly d9ef466247d4f97b763014797d95bf27dce90c21 [formerly a10753ebe7 ]]
Former-commit-id: 1a2b7abfa8d1cd69372ff7198e0d6eabac41ae22 [formerly bbfabbc442 ]
Former-commit-id: f983ef909b
|
2013-05-08 11:28:58 -05:00 |
|
David Gillingham
|
f98585c821
|
Issue #1988: Fix iscMosaic regression caused by DR 1941.
Change-Id: I6b2f28c6c1519645d3eedb081288e35545612ca9
Former-commit-id: 38b8a03b40 [formerly fb5996c663 ] [formerly 110c7d2571 ] [formerly 38b8a03b40 [formerly fb5996c663 ] [formerly 110c7d2571 ] [formerly 8140f0f00f [formerly 110c7d2571 [formerly d0ef15027759d301e16a4897b8ddc4a6670de2fb]]]]
Former-commit-id: 8140f0f00f
Former-commit-id: d913c3ae5f [formerly ea79ddc331 ] [formerly b933b5dddd80ffc8560b2d0fb385708af784ef49 [formerly 2dee8ddb16 ]]
Former-commit-id: cedb17efc89711e2f9cce2d4907b28463793c460 [formerly 696a6318f0 ]
Former-commit-id: f95203ecdc
|
2013-05-08 11:14:23 -05:00 |
|
Mike Duff
|
ca4329a312
|
Issue #1976 - Fix race condition in Hydro TS
Peer Review comments
Change-Id: I124176dcc242709f30f19152e7ecb6fda4e7c861
Former-commit-id: 9227336413 [formerly 62254c56ac ] [formerly c27de86f3d ] [formerly 9227336413 [formerly 62254c56ac ] [formerly c27de86f3d ] [formerly 00d96e88ac [formerly c27de86f3d [formerly 80c08a73c2bcaf853e63c175334b9f00dd93d696]]]]
Former-commit-id: 00d96e88ac
Former-commit-id: 9381a96b69 [formerly 9959645255 ] [formerly 77ca32375486746930a9155481ba12efa3a3637c [formerly ae1e879aa4 ]]
Former-commit-id: 2445ca01958a236a139e6a9474cac2cdf6b36cd5 [formerly 12722ddbcd ]
Former-commit-id: 62f8c7e9aa
|
2013-05-07 13:17:33 -05:00 |
|
Steve Harris
|
f04a1e8fc0
|
13.4.1-6 baseline
Former-commit-id: 5544c4a072 [formerly 6fcbb5ae6b ] [formerly 8379977673 ] [formerly 5544c4a072 [formerly 6fcbb5ae6b ] [formerly 8379977673 ] [formerly 16fe8cc5a2 [formerly 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]]]
Former-commit-id: 16fe8cc5a2
Former-commit-id: 5568ada76b [formerly 5be793f2f9 ] [formerly f649c7ad7b4bf50f9a110308d2253393bb3d2506 [formerly 979700c302 ]]
Former-commit-id: 772ececc049088d7fcf3524449b57d47ac45e322 [formerly 2e835dc591 ]
Former-commit-id: 5e54a425fb
|
2013-05-07 08:47:39 -04:00 |
|
Brad Gonzales
|
a086dd0b9f
|
Issue #1979 Fix Redbook frame issue parsing redbook data with a default header at the end of the buffer.
Change-Id: I30d89f84bbecf3250f491106b337c9c12ec88bb9
Former-commit-id: 86f2d468b9 [formerly d9b49b7a84 ] [formerly 13c449eb5d ] [formerly 86f2d468b9 [formerly d9b49b7a84 ] [formerly 13c449eb5d ] [formerly b0f07f4a83 [formerly 13c449eb5d [formerly 90e1c8b65baad0af8f8a7a27b6b308b504c1be27]]]]
Former-commit-id: b0f07f4a83
Former-commit-id: dea192df4c [formerly 44f4a99def ] [formerly 28992925c8c8648b9da9176c6b84fbc3632a837b [formerly f3428938df ]]
Former-commit-id: 4069b01551c16917e10af323b438d6c2a7d75965 [formerly 427ffaed29 ]
Former-commit-id: 550a5c04e8
|
2013-05-06 17:41:43 -05:00 |
|
Brad Gonzales
|
e89e522367
|
Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager.
Amend: Removed second create index pattern in SchemaManager and added a contains check
instead. Added a StringUtil replace method.
In StringUtil replace method, fixed increment of targetIndex before loop indexOf
check.
Change-Id: Ic3538db7298e295470afad2b6cf63ea9bf0fc5fd
Former-commit-id: e8fed35773 [formerly 578ce7cfe3 ] [formerly e80649cadf ] [formerly e8fed35773 [formerly 578ce7cfe3 ] [formerly e80649cadf ] [formerly 355ee727be [formerly e80649cadf [formerly 1ed7ce737e6a8d42db2c70892fc2173b5000b44e]]]]
Former-commit-id: 355ee727be
Former-commit-id: 2d8831d74f [formerly a34eb2f7fb ] [formerly d668de0876fdb9fb24324881defb39453e10519d [formerly 6c32c5a21f ]]
Former-commit-id: ddc8c5186274a3951244081b1e014fb796e4bb3c [formerly 2b37fefdc7 ]
Former-commit-id: a1c42b622a
|
2013-05-06 12:05:11 -05:00 |
|
Ben Steffensmeier
|
ace20bc459
|
Issue #1930 Check for null in WatchesResource.
Former-commit-id: 71d03e3242 [formerly 3af6d471d8 ] [formerly 721db403ad ] [formerly 71d03e3242 [formerly 3af6d471d8 ] [formerly 721db403ad ] [formerly b8cb330cd1 [formerly 721db403ad [formerly 7feb01b219e5ace4cd7df115c20c6f4f64869126]]]]
Former-commit-id: b8cb330cd1
Former-commit-id: 30b51f5d4d [formerly e3b56ac975 ] [formerly 76d062751a86d3a0966108d311b2bbf0dcd56abb [formerly 150b116995 ]]
Former-commit-id: 19e5e61a9a2b5c17c8e55f99b0a62bac65055367 [formerly 210c51c530 ]
Former-commit-id: b90331aa1d
|
2013-05-06 11:40:08 -05:00 |
|
Richard Peter
|
5fcf831fbd
|
Merge branch 'master_13.4.1' (13.4.1-5) into omaha_13.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanDrawer.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisByHourTabComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/TimeRange.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
nativeLib/dist.native/i386-pc-linux-gnu.tar
nativeLib/rary.ohd.filesystem/awips/hydroapps/set_hydro_env
pythonPackages/qpid/bin/qpid-queue-count
pythonPackages/qpid/bin/qpid-stat
rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/ldmadmin-pl.conf
rpms/awips2.core/Installer.ldm/src/awips2-ldm.6.11.2.tar.gz
rpms/awips2.core/Installer.ncep-database/component.spec
rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/build/x86_64/build.sh
tests/.classpath
Change-Id: Ie5c71a39060fdd21d17f1c73ec79c03dfe523cfb
Former-commit-id: d11666193f [formerly 17a5f519cc ] [formerly 083700d315 ] [formerly d11666193f [formerly 17a5f519cc ] [formerly 083700d315 ] [formerly 2b496de6d8 [formerly 083700d315 [formerly 9fb7a04d920e56496cdc896513da8fc54765c6d5]]]]
Former-commit-id: 2b496de6d8
Former-commit-id: e4f3d60d90 [formerly 398e808300 ] [formerly a57ab1971925eee09755783786207fd3536b9553 [formerly 349bcc15d7 ]]
Former-commit-id: c8a4f837912af5727cbf29ece9f4e5dfd427fc63 [formerly 7db060699c ]
Former-commit-id: 0bf43c4a4d
|
2013-05-05 14:25:36 -05:00 |
|