Benjamin Phillippe
0c80abcc15
Omaha #3379 Removing DWR
...
Former-commit-id: cc9e9b427a
[formerly d110e8428b
] [formerly cc9e9b427a
[formerly d110e8428b
] [formerly 4e1d93abf8
[formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 5eea012728
[formerly 06e73cd55f
]
Former-commit-id: 11a8186cbc
2014-07-11 11:56:44 -05:00
Brian Clements
f9af313995
Omaha #3364 added jmap -heap to capture script
...
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153
Former-commit-id: 146318e49e
[formerly 82cf017cbe
] [formerly 146318e49e
[formerly 82cf017cbe
] [formerly d5506736df
[formerly 65c88529acfb31c408777337f456da5dce879146]]]
Former-commit-id: d5506736df
Former-commit-id: 10a01f3556
[formerly 2c4fb16c12
]
Former-commit-id: c134d1f514
2014-07-11 10:20:48 -05:00
Richard Peter
4b45d26b40
Merge "Omaha #3318 Delta script for GEFS h5 file updates" into omaha_14.4.1
...
Former-commit-id: 57318e4446
[formerly c3740f0f11
] [formerly 57318e4446
[formerly c3740f0f11
] [formerly 98d7cbab0d
[formerly b5d7d388acb17911b4592182884ac8bfac687c4f]]]
Former-commit-id: 98d7cbab0d
Former-commit-id: 1dac01c298
[formerly d9ea2c328c
]
Former-commit-id: c69d97ffb2
2014-07-10 17:47:50 -05:00
Nate Jensen
4b61b6b5f8
Merge "Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh" into omaha_14.4.1
...
Former-commit-id: 205b90cb24
[formerly 68170f4a3e
] [formerly 205b90cb24
[formerly 68170f4a3e
] [formerly f92d9eb817
[formerly c114f3578804f9eb2fd130428bb327c968f0fbdf]]]
Former-commit-id: f92d9eb817
Former-commit-id: c69237b1b8
[formerly 0f254686cb
]
Former-commit-id: 0a9e037818
2014-07-10 17:02:48 -05:00
Nate Jensen
dc92b58bd7
Merge "Omaha #3165 update manifests for ll.netcdf rename" into omaha_14.4.1
...
Former-commit-id: c3e7b245af
[formerly ffa31a72ab
] [formerly c3e7b245af
[formerly ffa31a72ab
] [formerly b267109497
[formerly 599f7a6d2eff8723cbf515b14afefc270f42cdd0]]]
Former-commit-id: b267109497
Former-commit-id: 2f163afff8
[formerly 55d87b6260
]
Former-commit-id: 5ab8718156
2014-07-10 16:32:02 -05:00
Brian Clements
f2d27e2f8b
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
...
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: 987d514fa3
[formerly 871a8655c8
] [formerly 987d514fa3
[formerly 871a8655c8
] [formerly 0113e109d3
[formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]
Former-commit-id: 0113e109d3
Former-commit-id: ed9ba91d4e
[formerly c32592fd1c
]
Former-commit-id: 94f5989af7
2014-07-10 16:31:11 -05:00
Roger Ferrel
e197f2e62c
Omaha #3318 Delta script for GEFS h5 file updates
...
Former-commit-id: 577790589f
[formerly d007725e9a
] [formerly 577790589f
[formerly d007725e9a
] [formerly 9eaeb01624
[formerly 2e6eeaeac3018a34bf5a471f4ebcae58e608fbca]]]
Former-commit-id: 9eaeb01624
Former-commit-id: 4449133a46
[formerly ee1a95ceb1
]
Former-commit-id: a1a4ed75bc
2014-07-10 16:30:03 -05:00
Everett Kladstrup
4e95dec1a1
Omaha #3165 update manifests for ll.netcdf rename
...
Former-commit-id: 9cf007e546
[formerly 4e3b76ae29
] [formerly 9cf007e546
[formerly 4e3b76ae29
] [formerly febe13a241
[formerly 434ab5131e44d772d04c029833e2979fc19b6421]]]
Former-commit-id: febe13a241
Former-commit-id: c5e71e2348
[formerly e18ad7caec
]
Former-commit-id: 3768d18a0d
2014-07-10 16:19:42 -05:00
Bryan Kowal
5f3d74f37f
Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
...
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.
Former-commit-id: 32aa07f1fc
[formerly 984842331d
] [formerly 32aa07f1fc
[formerly 984842331d
] [formerly 49ffec76ff
[formerly 146e5ebed335bf25cbae152eef1b0544e833f741]]]
Former-commit-id: 49ffec76ff
Former-commit-id: 4e295dba49
[formerly 9fa0118ce9
]
Former-commit-id: f2242a2bda
2014-07-10 11:16:19 -05:00
Nate Jensen
fdad2eb28b
Omaha #3165 fix bad manifests
...
Change-Id: I9cef6a2086a7688fa5db412073af2b565396958a
Former-commit-id: b874c80f93
[formerly c323b72f48
] [formerly b874c80f93
[formerly c323b72f48
] [formerly eef97e7ec0
[formerly 4792e114d091b244b46d54b0846b8535583e4068]]]
Former-commit-id: eef97e7ec0
Former-commit-id: 7ceb81ec48
[formerly aef963a64e
]
Former-commit-id: ab38f37d7f
2014-07-10 09:20:24 -05:00
Ron Anderson
f7b8803180
Issue #3146 Added check for duplicate smartInit.
...
Added alertViz message for GFE site activation failure
Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004
Former-commit-id: 9f4e89347a
[formerly 0c0739bd72
] [formerly 9f4e89347a
[formerly 0c0739bd72
] [formerly 468668e19b
[formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]]
Former-commit-id: 468668e19b
Former-commit-id: ed7f6f731e
[formerly a917ea16a4
]
Former-commit-id: 7877809108
2014-07-09 16:42:43 -05:00
Brian Clements
5e7da3ffac
Omaha #3214 fixed cache object usage in lightning resource
...
pulse and cloud flashes were not updated properly in the cache
Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486
Former-commit-id: dba1fb3fc1
[formerly 994226e82b
] [formerly dba1fb3fc1
[formerly 994226e82b
] [formerly ac8f861112
[formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]]
Former-commit-id: ac8f861112
Former-commit-id: f9dad29ad8
[formerly e74fcfbce1
]
Former-commit-id: 97451515b6
2014-07-09 14:13:47 -05:00
Nate Jensen
8dfb9649d2
Merge "Omaha #3361 reduce number of extraneous localization requests at GFE startup" into omaha_14.4.1
...
Former-commit-id: 011089ab35
[formerly 9f7aef5f3e
] [formerly 011089ab35
[formerly 9f7aef5f3e
] [formerly 2a18111bdc
[formerly 56263f9c5dbc38d838e8da5df252ba5043f846ab]]]
Former-commit-id: 2a18111bdc
Former-commit-id: c07ae4fa3a
[formerly f8386f0570
]
Former-commit-id: b868f3416b
2014-07-09 09:47:07 -05:00
Nate Jensen
ed4cfdb1f3
Omaha #3361 reduce number of extraneous localization requests at GFE
...
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: c3bd61a2c0
[formerly 0c397d2b7e
] [formerly c3bd61a2c0
[formerly 0c397d2b7e
] [formerly 5547ea1c7d
[formerly efa10ca2702ecee4535711be06373e5d079ac117]]]
Former-commit-id: 5547ea1c7d
Former-commit-id: d5f944d203
[formerly af08cc189f
]
Former-commit-id: 9931cfdf84
2014-07-09 09:24:31 -05:00
Nate Jensen
a4d8924e25
Merge "Omaha #3357 Ingest JVM shouldn't pull in DPA beans Change-Id: I59d0cf13a7704499093b401328bda5867197c525" into omaha_14.4.1
...
Former-commit-id: c818bca5c3
[formerly 25f5e8f2e0
] [formerly c818bca5c3
[formerly 25f5e8f2e0
] [formerly b9b26f1b54
[formerly a1a17c4757be0a60d6634384e5de1cbfd611096d]]]
Former-commit-id: b9b26f1b54
Former-commit-id: 9dd837e39d
[formerly 8e83a7d278
]
Former-commit-id: 1e0e752c2c
2014-07-08 13:29:37 -05:00
Dave Hladky
f2ad4695d9
Omaha #3357 Ingest JVM shouldn't pull in DPA beans
...
Change-Id: I59d0cf13a7704499093b401328bda5867197c525
Former-commit-id: 36b0428ff9
[formerly 53f26636f7
] [formerly 36b0428ff9
[formerly 53f26636f7
] [formerly a0d305355b
[formerly 4a5e3dc51e01bfb1fa6c50df7ba4f1a65bac9ba1]]]
Former-commit-id: a0d305355b
Former-commit-id: e83c58641d
[formerly d8fb83d443
]
Former-commit-id: 0add67c080
2014-07-08 12:29:04 -05:00
Bryan Kowal
ec5f9c6623
Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
...
Former-commit-id: 58a2ae8bc8
[formerly 98a310f4a7
] [formerly 58a2ae8bc8
[formerly 98a310f4a7
] [formerly 6a197f845d
[formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]]
Former-commit-id: 6a197f845d
Former-commit-id: ac1b94c63f
[formerly 0fdfc0fd4a
]
Former-commit-id: d1898937e0
2014-07-08 09:31:21 -05:00
Ben Steffensmeier
e859b8f822
Merge "Omaha #3356 remove common register buddies to uf.viz.core" into omaha_15.1.1
...
Former-commit-id: 3394a6230e
[formerly 3bbf29f639
] [formerly 3394a6230e
[formerly 3bbf29f639
] [formerly 9eb9abd3f4
[formerly 98cc84304173c5a8ae366b8a60273f46d97bf2ee]]]
Former-commit-id: 9eb9abd3f4
Former-commit-id: fb17181baa
[formerly 956e9bb5b0
]
Former-commit-id: eca19918dc
2014-07-07 18:48:49 -05:00
Nate Jensen
d0399c82b8
Omaha #3356 remove common register buddies to uf.viz.core
...
Change-Id: I8da0d7bb51c7aa3585c29ada43ba9d6470ec41e4
Former-commit-id: 57635e6f3f
[formerly 5148898b23
] [formerly 57635e6f3f
[formerly 5148898b23
] [formerly 886aee2bf9
[formerly 3fc986e2d7b24a6a3a9642a9bb0c71b296573a68]]]
Former-commit-id: 886aee2bf9
Former-commit-id: aad51b7f11
[formerly 2a55f0db4e
]
Former-commit-id: ac8e3f3fd5
2014-07-07 17:32:37 -05:00
Brian Clements
f3735af783
Omaha #3333 removed redundant field from viz lightning
...
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: 91b136c2a0
[formerly 572d95e78a
] [formerly 91b136c2a0
[formerly 572d95e78a
] [formerly e4795f6a13
[formerly 2e701ade395cb2ec81d86af714fad825e146dc25]]]
Former-commit-id: e4795f6a13
Former-commit-id: 9afb344828
[formerly e1d5d86d29
]
Former-commit-id: b2a4b1da71
2014-07-07 15:13:28 -05:00
Brian Clements
2bebd393d8
Omaha #1255 fixed collaboration colors
...
config.xml was not in build.properties
provided a fallback default if config is missing
Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6
Former-commit-id: aeb093ad95
[formerly 0d4cd4bab8
] [formerly aeb093ad95
[formerly 0d4cd4bab8
] [formerly da53d9ccc7
[formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 2cea766aed
[formerly e6e84d2c71
]
Former-commit-id: 9a1bc8c521
2014-07-07 12:29:12 -05:00
Richard Peter
1399f0cd57
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
...
Former-commit-id: 4219dbeec8
[formerly ba1bd20407
] [formerly 4219dbeec8
[formerly ba1bd20407
] [formerly 8c17e9cef2
[formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]
Former-commit-id: 8c17e9cef2
Former-commit-id: 3e19911306
[formerly 741fc59f34
]
Former-commit-id: b4e4629d24
2014-07-07 09:39:28 -05:00
Richard Peter
48d293abd6
Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
...
Former-commit-id: 4312c9c569
[formerly 42ec8874c8
] [formerly 4312c9c569
[formerly 42ec8874c8
] [formerly 06a1d1555c
[formerly 6d960e34632c2f615720c0550296d38feb8c90f6]]]
Former-commit-id: 06a1d1555c
Former-commit-id: d27ebb1175
[formerly 804e9d1035
]
Former-commit-id: b97f693554
2014-07-07 09:30:09 -05:00
Richard Peter
5d650dcab2
Merge "Omaha #3350 Removing OBE classes/files for registry user registry and identity management" into omaha_14.4.1
...
Former-commit-id: 8a5608d851
[formerly a50a5b1663
] [formerly 8a5608d851
[formerly a50a5b1663
] [formerly 98d82de231
[formerly 0312ae103ee4dedea47c9ede9bb5651629e5a5b9]]]
Former-commit-id: 98d82de231
Former-commit-id: e57ce89b6b
[formerly ce245ac8cf
]
Former-commit-id: 72f61418a3
2014-07-07 09:21:02 -05:00
Ron Anderson
6935f82cfa
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
...
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: fd16321f82
[formerly 8d50f9d15a
] [formerly fd16321f82
[formerly 8d50f9d15a
] [formerly 24faa48233
[formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]]
Former-commit-id: 24faa48233
Former-commit-id: ae401db2ab
[formerly 87664d86a5
]
Former-commit-id: 9a873532ad
2014-07-07 09:02:14 -05:00
Roger Ferrel
0554d1834c
Omaha #3348 Handle Enter event on Open's tree and text field.
...
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4
Former-commit-id: 1964c7c4f7
[formerly 6305bfdcb6
] [formerly 1964c7c4f7
[formerly 6305bfdcb6
] [formerly f064f0d102
[formerly 29cc43c5f9b43a51b24b702f04f0a62fab1bd356]]]
Former-commit-id: f064f0d102
Former-commit-id: 74f5c7eb82
[formerly 7649930247
]
Former-commit-id: da45f3e5e2
2014-07-07 08:52:50 -05:00
Steve Harris
6aa24992e2
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: e7de4b7130
[formerly 9886a6aa5f
] [formerly e7de4b7130
[formerly 9886a6aa5f
] [formerly 77259e5c18
[formerly cdc44956b4cd8ee3415ffb83d0d652d7162541d5]]]
Former-commit-id: 77259e5c18
Former-commit-id: 7071f50293
[formerly 853d803527
]
Former-commit-id: 9ef301c4b3
2014-07-07 08:35:33 -05:00
Brian Clements
55bcd816ff
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: c3a25024ae
[formerly bfd9f59de8
] [formerly c3a25024ae
[formerly bfd9f59de8
] [formerly e4c9a13adb
[formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]
Former-commit-id: e4c9a13adb
Former-commit-id: 50d2c6e24c
[formerly bd9520f4fe
]
Former-commit-id: 276dd801f2
2014-07-03 15:11:48 -05:00
Benjamin Phillippe
9058a06b0e
Omaha #3350 Removing OBE classes/files for registry user registry and identity management
...
Former-commit-id: c6c2f9240e
[formerly ba0472caad
] [formerly c6c2f9240e
[formerly ba0472caad
] [formerly 7960578e2c
[formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]]]
Former-commit-id: 7960578e2c
Former-commit-id: 600a6c245a
[formerly 29f98ed5ab
]
Former-commit-id: eaf031c3dd
2014-07-03 12:53:22 -05:00
Nate Jensen
5a7e3697e4
Omaha #3165 fix grib logging imports
...
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021
Former-commit-id: e101d99ba2
[formerly bd46c43240
] [formerly e101d99ba2
[formerly bd46c43240
] [formerly 063ccb25e6
[formerly 12665e265f8490101099f96a84240b478e6f5a5f]]]
Former-commit-id: 063ccb25e6
Former-commit-id: 4cb1e42ddb
[formerly 4dc36437fa
]
Former-commit-id: 998c6e4253
2014-07-03 11:07:41 -05:00
Bryan Kowal
171785fb9e
Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
...
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.
Former-commit-id: d0d5a08057
[formerly 38d2431518
] [formerly d0d5a08057
[formerly 38d2431518
] [formerly a83301c1e9
[formerly 03364fb2cdde0b7d7f5456335c99bae433628711]]]
Former-commit-id: a83301c1e9
Former-commit-id: 712ee6ea96
[formerly fa496a44f6
]
Former-commit-id: 8c2556649b
2014-07-02 15:58:50 -05:00
Roger Ferrel
862a065051
Omaha #3318 Changes to add GEFS to volumen browser.
...
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: 2723c92167
[formerly 02d9609862
] [formerly 2723c92167
[formerly 02d9609862
] [formerly 1869745cce
[formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]
Former-commit-id: 1869745cce
Former-commit-id: 37c05adfaf
[formerly 7f50b8fb93
]
Former-commit-id: a7daeebc77
2014-07-02 14:27:28 -05:00
Brian Clements
c502009375
Omaha #3245 caveUtil.sh handle memory overide in vm args
...
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: fdec99abc5
[formerly 013292ce9d
] [formerly fdec99abc5
[formerly 013292ce9d
] [formerly 2773cf8935
[formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]
Former-commit-id: 2773cf8935
Former-commit-id: 767d8abd20
[formerly 648ffac146
]
Former-commit-id: 6dea5ec026
2014-07-02 14:20:10 -05:00
Richard Peter
6710269555
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
...
Former-commit-id: 9c41b7c23e
[formerly 59325cf1f1
] [formerly 9c41b7c23e
[formerly 59325cf1f1
] [formerly 27ba905947
[formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]]
Former-commit-id: 27ba905947
Former-commit-id: a22847695d
[formerly 127ce13eb8
]
Former-commit-id: a357fc835b
2014-07-02 11:51:26 -05:00
Nate Jensen
54a1daffc6
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
...
Former-commit-id: e193fe4719
[formerly 324194117a
] [formerly e193fe4719
[formerly 324194117a
] [formerly 14b514df2c
[formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]]
Former-commit-id: 14b514df2c
Former-commit-id: be426fc965
[formerly f39f6858e2
]
Former-commit-id: 760adb2b77
2014-07-02 11:20:26 -05:00
Nate Jensen
f4540db824
Omaha #3165 build viz.useradmin before viz.datadelivery
...
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: 15d6ff7f79
[formerly f6cbccdc5c
] [formerly 15d6ff7f79
[formerly f6cbccdc5c
] [formerly 74e2bd1670
[formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]
Former-commit-id: 74e2bd1670
Former-commit-id: db24013aa6
[formerly e9b31a4429
]
Former-commit-id: db9550e367
2014-07-02 11:18:59 -05:00
Brian Clements
2cd0d94e5d
Omaha #1255 added collaboration specific color presets
...
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 08724fefd7
[formerly 8b5ad1ec33
] [formerly 08724fefd7
[formerly 8b5ad1ec33
] [formerly eac871eed7
[formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]
Former-commit-id: eac871eed7
Former-commit-id: ea1ac8ee8f
[formerly cd282ef018
]
Former-commit-id: d066846c3f
2014-07-02 10:02:52 -05:00
Nate Jensen
ef967d42e3
Omaha #3165 attempt to fix build
...
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 1373af3e55
[formerly a93af621d8
] [formerly 1373af3e55
[formerly a93af621d8
] [formerly 765ac1258b
[formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]
Former-commit-id: 765ac1258b
Former-commit-id: bbd50040a5
[formerly 264ac4d8a3
]
Former-commit-id: d1d3aa94a6
2014-07-02 10:01:05 -05:00
Nate Jensen
8c99b38625
Omaha #3165 separate registry plugins for viz to support hazard services
...
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: a16d8689e9
[formerly f10efa300c
] [formerly a16d8689e9
[formerly f10efa300c
] [formerly f32bf19eb7
[formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]
Former-commit-id: f32bf19eb7
Former-commit-id: ec64800f28
[formerly 55dcecc7a7
]
Former-commit-id: e659a0702d
2014-07-01 17:37:08 -05:00
Richard Peter
5e343e9cf4
Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
...
Former-commit-id: 57ec1df5a5
[formerly b8f2fddd95
] [formerly 57ec1df5a5
[formerly b8f2fddd95
] [formerly 8dfa9696af
[formerly 956c4d9672e8706774d00f58e42b848c9917eb9f]]]
Former-commit-id: 8dfa9696af
Former-commit-id: 93ef55e65e
[formerly d8687baba7
]
Former-commit-id: b7db53b921
2014-07-01 16:03:36 -05:00
Richard Peter
0ccb573e31
Omaha 3300 Fix merge issue in gfe-spring.xml
...
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea
Former-commit-id: b38dd722be
[formerly 40c01d05d4
] [formerly b38dd722be
[formerly 40c01d05d4
] [formerly eacaf068a7
[formerly 59bf1aba9614d3206eb5e3d02d985d726a5c9fbe]]]
Former-commit-id: eacaf068a7
Former-commit-id: 7961742ee6
[formerly a4beeb4d1b
]
Former-commit-id: 5b0667e61f
2014-07-01 15:43:46 -05:00
Richard Peter
342192e967
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 6636b301e5
[formerly 93bbd98cbc
] [formerly 6636b301e5
[formerly 93bbd98cbc
] [formerly 8ecc27f714
[formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 552ac6d640
[formerly fc27824dbc
]
Former-commit-id: 0fefdc7cd6
2014-07-01 15:34:39 -05:00
Roger Ferrel
481617bff0
Omaha #3230 Recursive search for model files.
...
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49
Former-commit-id: 69fab4d289
[formerly cd3720035d
] [formerly 69fab4d289
[formerly cd3720035d
] [formerly a8c93f7783
[formerly c4009c2b4e19c5c1d65a1844c12a7e63e9366b9b]]]
Former-commit-id: a8c93f7783
Former-commit-id: bb6e08ae2f
[formerly f7fe138cc1
]
Former-commit-id: 84fcb66cd0
2014-07-01 15:33:30 -05:00
Steve Harris
15267970e4
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
...
Former-commit-id: f68e051938
[formerly 1c8dc56d49
] [formerly f68e051938
[formerly 1c8dc56d49
] [formerly 30cdbff7f8
[formerly 382c772c196711d230395f34a04559c188880622]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: a4d91c59d6
[formerly 6f9129ac78
]
Former-commit-id: d600ed9acf
2014-07-01 13:38:18 -05:00
Nate Jensen
7d03309e18
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
...
Former-commit-id: 81ca7a9e9f
[formerly c0d36e9a69
] [formerly 81ca7a9e9f
[formerly c0d36e9a69
] [formerly 1183c0538e
[formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]]
Former-commit-id: 1183c0538e
Former-commit-id: 52d5edac63
[formerly cb9e715aec
]
Former-commit-id: 10dee29029
2014-07-01 10:30:54 -05:00
Nate Jensen
73bdd3a339
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
...
Former-commit-id: ac0f0e2298
[formerly 0a9fc691b9
] [formerly ac0f0e2298
[formerly 0a9fc691b9
] [formerly fbda7c4489
[formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]
Former-commit-id: fbda7c4489
Former-commit-id: fe1f9e8977
[formerly 9e6433f44b
]
Former-commit-id: 6f0d007112
2014-07-01 10:22:25 -05:00
Greg Armendariz
900bd92331
Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
...
Former-commit-id: 134f0e2e8b
[formerly 82fe8608e0
] [formerly 134f0e2e8b
[formerly 82fe8608e0
] [formerly 0688e9db1b
[formerly e6a5ab99510887f28c4a98afaa28f122f814d5a5]]]
Former-commit-id: 0688e9db1b
Former-commit-id: 471814e891
[formerly fa76c0c1df
]
Former-commit-id: 36252d33b2
2014-07-01 10:17:11 -05:00
Nate Jensen
5ed2cdc4ec
Merge "Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range." into omaha_14.4.1
...
Former-commit-id: 3b2dc2915e
[formerly 35e3626527
] [formerly 3b2dc2915e
[formerly 35e3626527
] [formerly 1d2ae81ff6
[formerly 76fd0a563baa40722ce645d8019c40dbc42405b6]]]
Former-commit-id: 1d2ae81ff6
Former-commit-id: 14d368f33b
[formerly 8a03a5ecb9
]
Former-commit-id: c0096b0570
2014-07-01 10:12:14 -05:00
Steve Harris
8fb747ad27
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 2f2958df37
[formerly d4dc1723c1
] [formerly 2f2958df37
[formerly d4dc1723c1
] [formerly 7acd9ab2dd
[formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75
[formerly dcbab5621f
]
Former-commit-id: 71357da9d2
2014-07-01 11:08:46 -04:00
Richard Peter
2bf09c794f
Merge "Omaha #3255 Updated Proxy classes to include all java proxy config settings" into omaha_14.4.1
...
Former-commit-id: 838739ebbb
[formerly 027fff1de0
] [formerly 838739ebbb
[formerly 027fff1de0
] [formerly e7d0dd1e28
[formerly 33080d565ceb85a0a0945f7c0d6a81caaa715b62]]]
Former-commit-id: e7d0dd1e28
Former-commit-id: d0ce3374a7
[formerly 0cef25a49c
]
Former-commit-id: a936bb8c7c
2014-07-01 10:02:57 -05:00