Bryan Kowal
19d4449455
Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
...
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
Former-commit-id: d7a09e23cd31ee9b4bdca962be9a15a962be9a150b4961e9b0d7a09e23cd31ee9b4bdca962be9a15a962be9a150b4961e9b08b51e353f1a962be9a150b4961e9b08b51e353f18b51e353f115428cc6975ccd6283059943f3a57c9943f3a57c5dffc9321c9f506d7ce69af6b447279f506d7ce6d75fd1d5ec
2013-08-15 15:38:11 -05:00
Bryan Kowal
9e1afffeaf
Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
...
Conflicts:
RadarServer/build.rcm/build.xml
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
Former-commit-id: 5c5bcd5313fb1feea107683d7e5b19683d7e5b19c1dab22fdb5c5bcd5313fb1feea107683d7e5b19683d7e5b19c1dab22fdb94eacfc460683d7e5b19c1dab22fdb94eacfc46094eacfc4605df080a51d33b6f0389953124c5e0253124c5e0275c6d4ebf62e6116a952eab659f9612e6116a952cb7e87d9a4
2013-08-15 15:30:05 -05:00
Bryan Kowal
6c83e6c5d8
Issue #2163 - additional RHEL6 changes
...
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready
Former-commit-id: cbf1c3f9b56e76fc66245feab7c0be5feab7c0bebbca63a8b8cbf1c3f9b56e76fc66245feab7c0be5feab7c0bebbca63a8b836eca9bbfb5feab7c0bebbca63a8b836eca9bbfb36eca9bbfb983d0f8f7445ab6afc319b62e39fff9b62e39fff1f5e92aac9b32933f72a858a41c50db32933f72acc84331809
2013-08-15 15:25:52 -05:00
Bryan Kowal
4857155a15
Issue #2163 - pgadmin 3 updated for RHEL 6 compatibility
...
Former-commit-id: dbf78850ee37ebd41ee01c2ca11a331c2ca11a33b08a9da804dbf78850ee37ebd41ee01c2ca11a331c2ca11a33b08a9da804b1e4e77a131c2ca11a33b08a9da804b1e4e77a13b1e4e77a130abdddd243b177c46971a5effbed37a5effbed37c97d4f42b6b68cdebe4e8068e7a7b2b68cdebe4e9bf0e0ab3c
2013-08-15 15:25:43 -05:00
Bryan Kowal
5f0c8f37ba
Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
...
- httpd has been updated for compatibility
Former-commit-id: 677900388c3074681a82d3f5a8ecfdd3f5a8ecfd91a84e57b5677900388c3074681a82d3f5a8ecfdd3f5a8ecfd91a84e57b5c0614bc7d4d3f5a8ecfd91a84e57b5c0614bc7d4c0614bc7d41f6581c569b1bf84330768c89e673668c89e6736ba043362624df25d3b0f44722e11064df25d3b0f016bc8099d
2013-08-15 15:25:02 -05:00
Bryan Kowal
a4909c1ee7
Issue #2163 - 64-bit RHEL6 rpm conversion
...
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries
Former-commit-id: f80a857a5e35478ce5ffb32922186db32922186d0bee225031f80a857a5e35478ce5ffb32922186db32922186d0bee225031e686f9bddab32922186d0bee225031e686f9bddae686f9bddaccbde0a16ad30c0983828d4645a0a48d4645a0a4e24b249d5b55e29b2bba5b451d09f155e29b2bbaad5a8ced22
2013-08-15 15:24:48 -05:00
Bryan Kowal
8af3a86733
Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
...
Former-commit-id: 801adf437361b14897fd2b4faafed72b4faafed7e3e596eb5d801adf437361b14897fd2b4faafed72b4faafed7e3e596eb5dbe011d3b922b4faafed7e3e596eb5dbe011d3b92be011d3b92998662f6a75185e797856561efe4576561efe4577b1615ba80f61b4377468331e2a16af61b437746832f4a5250
2013-08-15 15:24:11 -05:00
Steve Harris
ab45189ba9
13.5.1-15 baseline
...
Former-commit-id: 64369ef595b05abcaec0535218c676535218c67653e96e21db64369ef595b05abcaec0535218c676535218c67653e96e21dbc6dc1817e7535218c67653e96e21dbc6dc1817e7c6dc1817e7b04a64a4b46f1b6d494f4f9288e7c14f9288e7c165beefde58d0be6956e99ea3f0c215d0be6956e9a700182250
2013-08-14 10:24:26 -04:00
Steve Harris
bf73474e16
13.5.1-14 baseline
...
Former-commit-id: 05ec949b01c6465a3398b848317203b848317203d695e5debe05ec949b01c6465a3398b848317203b848317203d695e5debe80e5f7fbd4b848317203d695e5debe80e5f7fbd480e5f7fbd4f1b3e9c0614e753331559bd983e2fe9bd983e2fecd5b1e9e2ff4262380d60f3ffc3892f4262380d6a338706fa4
2013-08-14 10:07:41 -04:00
Greg Armendariz
8faed9c4d5
13.5.1-13 baseline
...
Former-commit-id: 997dff83e0429898edc6f0b62a22bff0b62a22bf29b823fee4997dff83e0429898edc6f0b62a22bff0b62a22bf29b823fee45577e686c1f0b62a22bf29b823fee45577e686c15577e686c1077eae6c88076a0b08ac9f2f62427b9f2f62427b8bfac41add0c61b62d24b66fcc40a50c61b62d24b264a9d841
2013-08-08 17:00:36 -04:00
Greg Armendariz
2617862584
13.5.1-12 baseline
...
Former-commit-id: 1d7ced125134e0218b5901d067cff901d067cff9c9898ba8d11d7ced125134e0218b5901d067cff901d067cff9c9898ba8d1fe51885ba701d067cff9c9898ba8d1fe51885ba7fe51885ba7bb3d873b5175d1e77f1bf777a744e5f777a744e59892a1a262244bc3ac37cbf9e42c21244bc3ac37d37c94464b
2013-08-08 15:34:01 -04:00
Greg Armendariz
4c677773bf
13.5.1-11 baseline
...
Former-commit-id: cccf0d6f34814f7fdcddc402dbf6e9c402dbf6e9ea7b22500ecccf0d6f34814f7fdcddc402dbf6e9c402dbf6e9ea7b22500e4ec04083bdc402dbf6e9ea7b22500e4ec04083bd4ec04083bd315f7aa77c4c20fc497775f9f8df3f75f9f8df3f26e58d8cdb8bf2c1cc07f06ee472608bf2c1cc077fb928e967
2013-08-07 14:34:27 -04:00
Greg Armendariz
f300504a0f
13.5.1-10 baseline
...
Former-commit-id: 7da9205d7c9694f9390ae276b0fabee276b0fabe852455843f7da9205d7c9694f9390ae276b0fabee276b0fabe852455843facf7ced37be276b0fabe852455843facf7ced37bacf7ced37b7999677d4f690ea2e2289ddb32967c9ddb32967c05282eac885998f47f57f37ef8c24e5998f47f570bb16ced54
2013-08-07 14:14:46 -04:00
Steve Harris
ef03987f27
13.5.1-9 baseline
...
Former-commit-id: 4190998d5d1be9abc02f778df21de9778df21de997fe6a670f4190998d5d1be9abc02f778df21de9778df21de997fe6a670f6e60cd9a79778df21de997fe6a670f6e60cd9a796e60cd9a79a0f92aa82e7fc384a659c7e7c838aac7e7c838aabbb7f1dd49ef41819406e16fce85aeef41819406a7c6d3b46d
2013-08-01 09:20:23 -04:00
Steve Harris
2cdc6c2c49
13.5.1-8 baseline
...
Former-commit-id: 974c5fa6c052da6c54db392faf86e7392faf86e73bece5e5d0974c5fa6c052da6c54db392faf86e7392faf86e73bece5e5d0dfbf9a5afe392faf86e73bece5e5d0dfbf9a5afedfbf9a5afede1f3ab63c340e7bab60a7d4c6274ea7d4c6274e2afb46f814767b7fdb4d1a3197efdf767b7fdb4ddded20dc93
2013-07-26 09:02:34 -04:00
Steve Harris
1243f86b8b
13.5.1-7 baseline
...
Former-commit-id: 65139f6e1167299457b1630705aa3f630705aa3fbf58a81b3865139f6e1167299457b1630705aa3f630705aa3fbf58a81b3886ce1248c2630705aa3fbf58a81b3886ce1248c286ce1248c202f16dcf120fe8173b7bcb50a0028dcb50a0028df9c9aecba5513c089375eff4fb29dd513c089375adf2f89d57
2013-07-18 12:07:22 -04:00
Greg Armendariz
eb0ffb6bd1
13.5.1-6 baseline
...
Former-commit-id: 77b368d424e375a74bc8589485399658948539967e09fa5a0b77b368d424e375a74bc8589485399658948539967e09fa5a0bb9044b119558948539967e09fa5a0bb9044b1195b9044b11952e764ce73cf23d42e97793b71934c093b71934c012a09f9aa7b601345c9fec2637676db601345c9fdf73c0e2e9
2013-07-10 10:04:22 -04:00
Greg Armendariz
e72669bfd6
13.5.1-5 baseline
...
Former-commit-id: 1951f88626ed9da994c782aabf106682aabf1066492f92ef7b1951f88626ed9da994c782aabf106682aabf1066492f92ef7bea7ac3793082aabf1066492f92ef7bea7ac37930ea7ac379308ccd4b9cead5bea0fc06d899faec3dd899faec3d869922cb8213ac0b1062dc881f4ed813ac0b10625e1549062b
2013-07-03 12:20:27 -04:00
Steve Harris
d5a80e2c41
13.5.1-4 baseline
...
Former-commit-id: b6c29433822487a8b435c56be8a332c56be8a33270e4ff30a6b6c29433822487a8b435c56be8a332c56be8a33270e4ff30a6e197f23ce3c56be8a33270e4ff30a6e197f23ce3e197f23ce3177d322f7943bb696901640b022e84640b022e84f658320357c05a6c8b50c183e08922c05a6c8b509f5469bc6e
2013-06-28 09:46:25 -04:00
Steve Harris
77077ddc18
13.5.1-3 baseline
...
Former-commit-id: 61c9d5c3f0a0ff6c20ead8176d4a4cd8176d4a4c63803c142461c9d5c3f0a0ff6c20ead8176d4a4cd8176d4a4c63803c142472d22a30c9d8176d4a4c63803c142472d22a30c972d22a30c9829e7f4be8e1a5587dd0deebdb874adeebdb874a810388f00a50d4376af71e939939b550d4376af7d3517d7c1d
2013-06-24 09:29:43 -04:00
Steve Harris
325ad72f2d
13.5.1-2 baseline
...
Former-commit-id: 09606358557fe15db2f8bc60b22f00bc60b22f00adb779323d09606358557fe15db2f8bc60b22f00bc60b22f00adb779323d3386330894bc60b22f00adb779323d338633089433863308949f9f42876e0f83e19dabccd66c0724ccd66c07243926dc20f7afc02d5731332a74c4deafc02d57314d75e573f4
2013-06-17 15:01:22 -04:00
Steve Harris
98b3f1481d
13.5.1-1 baseline
...
Former-commit-id: 2f344da22c5d99df996963840189506384018950998961612c2f344da22c5d99df996963840189506384018950998961612cfe872355a76384018950998961612cfe872355a7fe872355a77da64307e243b7a9b4100aab285b8a0aab285b8a30ba1d634e859965fc9d146c5e8940859965fc9d97a4c59662
2013-06-10 15:17:17 -04:00
Steve Harris
78b772fd80
Merge branch 'master_13.4.1' into master_13.5.1
...
Conflicts (solved by taking all of 13.4.1-14):
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
rpms/awips2.core/Installer.ldm/component.spec
rpms/build/i386/build.sh
Former-commit-id: 9c29d4d816cdb89b5d29bb6628c17fbb6628c17fb0e5c758dc9c29d4d816cdb89b5d29bb6628c17fbb6628c17fb0e5c758dc2fc7f80939bb6628c17fb0e5c758dc2fc7f809392fc7f8093947d62fd44c7a0905578d69e1b32d1169e1b32d11eef1151c17e9904efd7f954e142d91e9904efd7f1b4abec7c3
2013-06-10 15:07:59 -04:00
Steve Harris
fbfe312a8e
13.4.1-14 baseline
...
Former-commit-id: b020fe654effcce90f3fbe236eb722be236eb722c749e122ebb020fe654effcce90f3fbe236eb722be236eb722c749e122eb18b90226a2be236eb722c749e122eb18b90226a218b90226a223e18f8552f7316ae4bdcebc1ddb63cebc1ddb63dee685e3c7d46b0413fb8ec7524cbbd46b0413fbc57686831a
2013-06-06 15:15:27 -04:00
Steve Harris
e6b97f4ced
13.4.1-13 baseline
...
Former-commit-id: 03eed8f3de9a7ef48967e3b8086bd0e3b8086bd087b971200903eed8f3de9a7ef48967e3b8086bd0e3b8086bd087b9712009de476791fbe3b8086bd087b9712009de476791fbde476791fbc492e47bbd70ecafa237418f8aef56418f8aef56b58cf237bf176f4d392fc9155c1631176f4d392f7e31d1a9a1
2013-05-29 16:30:09 -04:00
Steve Harris
fe3545caf5
13.4.1-12 baseline
...
Former-commit-id: 6bf996603a623f813923397bbf674a397bbf674a6a97b4325a6bf996603a623f813923397bbf674a397bbf674a6a97b4325ae53ada66b8397bbf674a6a97b4325ae53ada66b8e53ada66b8e2fda9382bfb41995981b745b332aeb745b332aebd4f93e85971e13c4d4d0d9e71aee271e13c4d4dcf67535a3a
2013-05-22 16:42:39 -04:00
Steve Harris
482972da43
13.4.1-11 baseline
...
Former-commit-id: 21425a8cf865d8f51034d6319a2ca6d6319a2ca62edee3615821425a8cf865d8f51034d6319a2ca6d6319a2ca62edee36158c0376ce9edd6319a2ca62edee36158c0376ce9edc0376ce9edef53f9db435db95cce554d888635154d888635156df093ef48d9f967c8112767fd893cd9f967c811603bc2535a
2013-05-21 09:19:25 -04:00
Steve Harris
07ee3320b9
13.4.1-10 baseline
...
Former-commit-id: 200966991b294c127b0a68fe2134b868fe2134b89a403b3615200966991b294c127b0a68fe2134b868fe2134b89a403b361592152778b968fe2134b89a403b361592152778b992152778b972109ef1c8ac83fff2447e04d8cd137e04d8cd13b1fc4e625bb41118326c322036ea82b41118326c0b9bf76434
2013-05-20 10:52:47 -04:00
Steve Harris
976677cf9b
13.4.1-9 baseline
...
Former-commit-id: 5bfd3fa498301821988e88eee9cbfa88eee9cbfabcf7f15c905bfd3fa498301821988e88eee9cbfa88eee9cbfabcf7f15c90aff41713f988eee9cbfabcf7f15c90aff41713f9aff41713f990a1fd05377d55d0e95967a95d07d267a95d07d20766ae20dd1730b6c41e3f87ea1a151730b6c41e202e373f01
2013-05-16 11:12:07 -04:00
Steve Harris
288a46d8fa
13.4.1-8 baseline
...
Former-commit-id: f446f7213b02dba50c00576a74fe0b576a74fe0b19866e7032f446f7213b02dba50c00576a74fe0b576a74fe0b19866e7032c59b52a266576a74fe0b19866e7032c59b52a266c59b52a266fca9074b6ffddef92bf354657645275465764527a1c4cd2a395bdcf5c0a1395d21565f5bdcf5c0a14b1a9ad438
2013-05-14 09:21:41 -04:00
Steve Harris
083165e69d
13.4.1-7 baseline
...
Former-commit-id: ef98d4ea0a81bc07bff48072752c778072752c774c6ff79e71ef98d4ea0a81bc07bff48072752c778072752c774c6ff79e718347bed50e8072752c774c6ff79e718347bed50e8347bed50e721ce85b446e1e454a9fff7a21ac37ff7a21ac37b35027f661c7c6ea343edffa6d3bdcc7c6ea343ea2c35a5f3f
2013-05-13 12:58:10 -04:00
Steve Harris
782768a7d2
13.4.1-6 baseline
...
Former-commit-id: fc8ca092c15544c4a0726fcbb5ae6b6fcbb5ae6b8379977673fc8ca092c15544c4a0726fcbb5ae6b6fcbb5ae6b837997767316fe8cc5a26fcbb5ae6b837997767316fe8cc5a216fe8cc5a227be6dce605568ada76b5be793f2f95be793f2f9979700c3025e54a425fb2e835dc5915e54a425fbf04a1e8fc0
2013-05-07 08:47:39 -04:00
Steve Harris
c4677c0b42
13.4.1-5 baseline
...
Former-commit-id: 4b5337f4d5313481c30eaa9a719836aa9a71983685bbf6d2424b5337f4d5313481c30eaa9a719836aa9a71983685bbf6d2424ae0e2e858aa9a71983685bbf6d2424ae0e2e8584ae0e2e85830da3bd108450dbb7e8de0af96524fe0af96524faa4624c58f210f5ee21953daaea355210f5ee219ab612b6c0f
2013-05-03 09:29:14 -05:00
Steve Harris
fd46b82625
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
...
Former-commit-id: 95ccb973f929777b406e344054d3e9344054d3e91a6fd7edfd95ccb973f929777b406e344054d3e9344054d3e91a6fd7edfd0f76c3cbee344054d3e91a6fd7edfd0f76c3cbee0f76c3cbeedfd1fbc9f4f83b6daf56c1349f4a6dc1349f4a6d99a7521fd6e1a369a499764924cd1ee1a369a4994647d70fd8
2013-05-03 09:20:30 -05:00
Steve Harris
8a7cf3eabe
13.4.1-4 baseline
...
Former-commit-id: 4ff5dfa203ef5893b27999f456965099f4569650d33e5861aa4ff5dfa203ef5893b27999f456965099f4569650d33e5861aa7a78f8ac6e99f4569650d33e5861aa7a78f8ac6e7a78f8ac6ee235e1816a7d085660f84357e2dacc4357e2dacc7828293d325dbfeb38ace0986cfda85dbfeb38acba48ab0362
2013-05-02 10:00:38 -05:00
Steve Harris
8959567624
13.4.1-3 baseline
...
Former-commit-id: b74dfa8e7503ff5cd82c3486902772348690277254afedf617b74dfa8e7503ff5cd82c3486902772348690277254afedf61786e96f378c348690277254afedf61786e96f378c86e96f378c7aa12aa45863a820bca59fb6f3835c9fb6f3835c8a41dd2048d8da1e82f57e923539d5d8da1e82f57193eee657
2013-04-29 12:25:07 -05:00
Steve Harris
e35104f5ef
13.4.1-2 baseline
...
Former-commit-id: 83436e5af54533276dd59212be8b749212be8b7452f0ae475883436e5af54533276dd59212be8b749212be8b7452f0ae47585ebd58a0b39212be8b7452f0ae47585ebd58a0b35ebd58a0b3c3e70a13ad9f9d623cb76880107d326880107d3299bc8c8072b2b9dac313c0481dcdf2b2b9dac313dc6ffe2ccf
2013-04-24 17:22:10 -05:00
Steve Harris
28575f2d5a
13.4.1-1 baseline
...
Former-commit-id: 925ad154e179567aac51f95e0ad10bf95e0ad10b2f517b7713925ad154e179567aac51f95e0ad10bf95e0ad10b2f517b771300332e6305f95e0ad10b2f517b771300332e630500332e6305da9bd1f32eaecc3cfd890e950655f10e950655f14accbb80db722e428c744001e050e7722e428c74b0fb1f49be
2013-04-24 17:15:55 -05:00
Steve Harris
6b1ee1f4ee
Merge branch 'master_13.3.1' into master_13.4.1
...
Former-commit-id: f138acf3269d57ad1675035878a846035878a8467957c52decf138acf3269d57ad1675035878a846035878a8467957c52dece6d37f3e6d035878a8467957c52dece6d37f3e6de6d37f3e6d14419fb70cf5ccd224d4e11088fefde11088fefdad513614087dbffd78a101dfc19f607dbffd78a1aded012c47
2013-04-15 09:34:45 -05:00
Steve Harris
fca9a65f58
13.3.1-20 baseline
...
Former-commit-id: 0c069f55b89e73c3f1ed07f7e6e2b407f7e6e2b425432cc3880c069f55b89e73c3f1ed07f7e6e2b407f7e6e2b425432cc388446bec6f4907f7e6e2b425432cc388446bec6f49446bec6f493a33be9ab41749ff8a3c8535bceb4c8535bceb4c4b71131386953ffdab8744cd8d47fb953ffdab8799d89adc2e
2013-04-15 08:58:59 -05:00
Steve Harris
bbf64046aa
13.3.1-19 baseline
...
Former-commit-id: 70eea29141196767d525dc9fef33a9dc9fef33a99be238bcc470eea29141196767d525dc9fef33a9dc9fef33a99be238bcc4abaf9f12f9dc9fef33a99be238bcc4abaf9f12f9abaf9f12f948e79746e7fe5020d315ed4150db5fed4150db5f340a2cfb237b7efd0bd17d763715367b7efd0bd1b6db7821fa
2013-04-09 08:37:12 -05:00
Steve Harris
15e1834f3e
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
...
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: 3124e2a4d155655fdab93487a415323487a41532ea34b1db1e3124e2a4d155655fdab93487a415323487a41532ea34b1db1ed98a119f4d3487a41532ea34b1db1ed98a119f4dd98a119f4dbff9046d971a2b88cd383ea89862c03ea89862c01a91fd82ffe0eda90af4f0918ec8ade0eda90af4370fe32515
2013-04-04 11:12:22 -05:00
Steve Harris
9f9ca8cdda
Merge AWIPS2 master branch (13.2.1-21) into master
...
Former-commit-id: b64c5de4fa0187ed0d28bf8a149596bf8a1495960676aa710ab64c5de4fa0187ed0d28bf8a149596bf8a1495960676aa710a19bb737425bf8a1495960676aa710a19bb73742519bb737425e8b8c55bcb467ced2742bf75c6aa20bf75c6aa208c5538c10ccb521ce569b26ed3c05dcb521ce569381a4002f3
2013-04-04 09:54:02 -05:00
Steve Harris
d1b4941fed
Merge branch 'master_13.2.1' into master
...
Former-commit-id: a9679feef24f764d1beec946213066c946213066f0b9589c11a9679feef24f764d1beec946213066c946213066f0b9589c119df0038ea3c946213066f0b9589c119df0038ea39df0038ea36b2dfda60a02eaa8f9be18e517f36118e517f36110d12180353e3a4a7c835de87a92b93e3a4a7c8342e7477c93
2013-04-04 10:51:40 -04:00
Steve Harris
ec5592a02f
Merge AWIPS2 master branch (13.2.1-19) into master
...
All conflicts overridden by 'theirs' merge - all of AWIPS2 master
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 87306229e7fcb5db91f44b2462390e4b2462390e4861007a0387306229e7fcb5db91f44b2462390e4b2462390e4861007a03dab32b04134b2462390e4861007a03dab32b0413dab32b04134f8f63b94c527c41b81e8a7bb1f4c88a7bb1f4c84bb5d51847c217183793d1962bef6bc2171837931f6b440afd
2013-04-04 08:22:05 -05:00
Steve Harris
07e06970e0
13.2.1-21 baseline
...
Former-commit-id: 986554d84b50106822eaa86d44584da86d44584dd4358b93dc986554d84b50106822eaa86d44584da86d44584dd4358b93dc33bd359cfea86d44584dd4358b93dc33bd359cfe33bd359cfea490b106fc688327d3145c029bc4ac5c029bc4ac18d6fa4f4d3d1d0a6a9ceb5258f0433d1d0a6a9cdd878fe749
2013-04-03 18:08:41 -04:00
Steve Harris
d7964f8c27
13.2.1-20 baseline
...
Former-commit-id: 0d650c33f83aa43b1b0dad663b925cad663b925c6a55bc5dff0d650c33f83aa43b1b0dad663b925cad663b925c6a55bc5dff539faf0a71ad663b925c6a55bc5dff539faf0a71539faf0a715b1b976bb73be498b2fcb062373048b06237304812d4316b3afbddfb5a259c51f2d15ffbddfb5a2554f2f2b94a
2013-04-03 18:05:39 -04:00
Steve Harris
9214b040e0
Merge branch 'master_13.2.1' into master
...
'theirs merge' - took all all master_13.2.1
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.core/META-INF/spring/viz.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.cots.feature/feature.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/AbstractAliasLevelNode.java
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/Activator.java
cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/GroupingComp.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/IStatsDisplay.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/SelectionManagerDlg.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsGraphDlg.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GridInfoDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointMetadataContainer.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
cots/org.junit/.classpath
cots/org.junit/META-INF/MANIFEST.MF
cots/org.junit/build.properties
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/bin/setup.env
edexOsgi/build.edex/esb/bin/wrapper.conf
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/build.edex/esb/etc/registry.sh
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.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/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticTopoData.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/TopoAttributes.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_ECMWF-98.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_FSL-59.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NWSTG-8.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_RFC-9.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_RSMC-54.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_UKMET-74.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/AbstractPrivilegedLocalizationRequestHandler.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/StatusConstants.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/subgrid/SubGridDef.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LocalizationFile.java
edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/NwsRoleData.java
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/UserXML.java
edexOsgi/com.raytheon.uf.common.serialization.comm/src/com/raytheon/uf/common/serialization/comm/RequestRouter.java
edexOsgi/com.raytheon.uf.common.sounding/utility/edex_static/base/python/RaobPyUtil.py
edexOsgi/com.raytheon.uf.common.stats/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/AggregateRecord.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/GraphDataRequest.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/DataPoint.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/GraphData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsBin.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsEventData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/util/UnitUtils.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/AbstractTimer.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimer.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimerImpl.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/utility/common_static/base/roles/userRoles.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/data/StatsDataAccumulator.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/util/Archiver.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/util/ConfigLoader.java
edexOsgi/com.raytheon.uf.edex.stats/utility/edex_static/base/stats/edexProcessStats.xml
nativeLib/dist.native/i386-pc-linux-gnu.tar
ncep/gov.noaa.nws.ncep.viz.gempak.nativelib.linux32/libgpk_logs.so
ncep/gov.noaa.nws.ncep.viz.gempak.nativelib.linux32/libgpk_nologs.so
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: 4b2bd82edb9379905195953d1697a9953d1697a98bf7abcd714b2bd82edb9379905195953d1697a9953d1697a98bf7abcd7104d398beb4953d1697a98bf7abcd7104d398beb404d398beb4e41e6af6b4fd2de8135b29d0a059dd29d0a059dd1801c8a0c95724a2e0310f90951b1b5724a2e0318b0c282f6a
2013-04-03 17:38:24 -04:00
Steve Harris
33b4ec2519
Merge branch 'master_13.1.2' into master
...
'theirs merge' - took all of master_13.1.2
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.parameter/build.properties
edexOsgi/com.raytheon.uf.common.spatial/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
Former-commit-id: 3cd459a1227a9ad0392eec6f65d581ec6f65d58120349e11b03cd459a1227a9ad0392eec6f65d581ec6f65d58120349e11b04ff8c8967aec6f65d58120349e11b04ff8c8967a4ff8c8967aeb6633a950b6f53af0bf49649155f249649155f26282e0fd3960847b986c0eb737164e60847b986c3e1eb0d8e0
2013-04-03 17:17:32 -04:00
Steve Harris
b20b6c09e1
13.3.1-18 baseline
...
Former-commit-id: 0e43cf2dcae621424fcbf3e79bcc9df3e79bcc9da2b098d86d0e43cf2dcae621424fcbf3e79bcc9df3e79bcc9da2b098d86dce6a06a7e3f3e79bcc9da2b098d86dce6a06a7e3ce6a06a7e39903d1edefa196ebc11b0edd049e3b0edd049e3bbf6c3b6762fc009792e3044912d48bfc009792e30cd73a41a1
2013-04-03 14:58:29 -05:00
