Commit graph

5040 commits

Author SHA1 Message Date
Ben Steffensmeier
5306c9969d Issue #2973 Use correct area for expanding subgrid requests.
Former-commit-id: 5b3a8dccbf [formerly 90f1750691] [formerly 5b3a8dccbf [formerly 90f1750691] [formerly 000f259cf4 [formerly 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b]]]
Former-commit-id: 000f259cf4
Former-commit-id: d52be1875d [formerly 7b2f82ff30]
Former-commit-id: 7bd153a696
2014-04-04 13:17:36 -05:00
Brian.Dyke
39b5e7fe67 Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 17477e7db1 [formerly 6a28fcb156] [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: dd98c213c7
Former-commit-id: 47d9095211 [formerly 9f37f61cf8]
Former-commit-id: be574897cc
2014-04-04 12:57:32 -04:00
steve.naples
32e931cead ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5

Former-commit-id: 75be620d0d [formerly f6636a3dd7] [formerly 75be620d0d [formerly f6636a3dd7] [formerly 7624f7ab75 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]]
Former-commit-id: 7624f7ab75
Former-commit-id: cfa9c6f01c [formerly 050238ee44]
Former-commit-id: 571efe3596
2014-04-04 15:30:18 +00:00
Steve Harris
fecb1acc59 Merge branch 'master_14.2.2' (14.2.2-1,2) into omaha_14.2.2
Former-commit-id: 4e65ecbf48 [formerly 15bc450e94] [formerly 4e65ecbf48 [formerly 15bc450e94] [formerly 58b8f72755 [formerly dd2ee3c6bb1fa1e3f1cde475da50d5e545446ed8]]]
Former-commit-id: 58b8f72755
Former-commit-id: 0bb0d02522 [formerly 01bdd24b6c]
Former-commit-id: ab51128b44
2014-04-03 13:08:28 -05:00
Steve Harris
f1c20fbc92 Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
Former-commit-id: 4b96900460 [formerly acd5392e9a] [formerly 4b96900460 [formerly acd5392e9a] [formerly cb2d69e338 [formerly ce1a2d441c1c882209f56fcb82f79edad51ff114]]]
Former-commit-id: cb2d69e338
Former-commit-id: 4e8a672c77 [formerly 09285db2d4]
Former-commit-id: 9bece467e0
2014-04-03 13:00:11 -05:00
Ron Anderson
0033d7d3ef Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.

Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b

Former-commit-id: 346984b8ab [formerly 11fbd86558] [formerly 346984b8ab [formerly 11fbd86558] [formerly d556055299 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]
Former-commit-id: d556055299
Former-commit-id: 3ac3d5de1b [formerly ac7c5460f6]
Former-commit-id: 4e88052beb
2014-04-02 09:07:22 -05:00
Greg Armendariz
cd8507faf2 Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1
Former-commit-id: 50fb1ec68a [formerly 6b339bcb86] [formerly 50fb1ec68a [formerly 6b339bcb86] [formerly 0d0d7bd513 [formerly 8d8277705568c04ac37bbe8f09bf7f38f2f0521f]]]
Former-commit-id: 0d0d7bd513
Former-commit-id: 380542d2eb [formerly cef70f2168]
Former-commit-id: 1ae96a358d
2014-04-01 19:33:30 -05:00
Richard Peter
034e62d64e Issue #2509: Fix stitched grid notifications
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4

Former-commit-id: bfba75f73f [formerly 53d5000261] [formerly bfba75f73f [formerly 53d5000261] [formerly f99875040c [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]]
Former-commit-id: f99875040c
Former-commit-id: b32eff04be [formerly 9ac8af6ccd]
Former-commit-id: 154034d653
2014-04-01 14:44:05 -05:00
Brian.Dyke
c2a3ec6f04 Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 3186434368 [formerly 6e515eb334] [formerly 3186434368 [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: d163d9d190 [formerly c013460db1]
Former-commit-id: 5345add58d
2014-04-01 14:29:33 -04:00
Dave Hladky
24724a8819 Issue #2949 Updated scripts
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80

Former-commit-id: 41e43a169b [formerly 3d6ebf498e] [formerly 41e43a169b [formerly 3d6ebf498e] [formerly ede510dd91 [formerly afcfc72329522c2d731a4afe9353632effb9cb23]]]
Former-commit-id: ede510dd91
Former-commit-id: b202d62214 [formerly be18d1f63c]
Former-commit-id: a3ac9604e6
2014-04-01 12:33:48 -05:00
David Gillingham
14f927fe54 Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9

Former-commit-id: 402adfeddb [formerly a529bc8cad] [formerly 402adfeddb [formerly a529bc8cad] [formerly 70b28b4e1e [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]]
Former-commit-id: 70b28b4e1e
Former-commit-id: 64981356c8 [formerly 22266d36b9]
Former-commit-id: 3ad0872bda
2014-03-31 15:49:33 -05:00
David Friedman
8f8f55dd3c Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.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
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: 32a7adbe4b [formerly fd900e38c2] [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1168a3eae5 [formerly 533d15c863]
Former-commit-id: dde12b4fc3
2014-03-27 19:17:03 +00:00
Brian.Dyke
102414db3a Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: a1b980a15d [formerly 6346c9776b] [formerly a1b980a15d [formerly 6346c9776b] [formerly 3b639347f8 [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]
Former-commit-id: 3b639347f8
Former-commit-id: 519ec3071a [formerly 76625c2238]
Former-commit-id: 9fa73765f9
2014-03-27 10:22:26 -04:00
Steve Harris
76def67552 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: d940427408 [formerly 53f91fdeea] [formerly d940427408 [formerly 53f91fdeea] [formerly e5910b6c60 [formerly b0b18895aa445ee9b29674443529558b2141c042]]]
Former-commit-id: e5910b6c60
Former-commit-id: 9d4f24da7b [formerly 1b9ebbddcc]
Former-commit-id: 7a7a9cc18e
2014-03-26 16:13:59 -05:00
Steve Harris
ef058152a0 Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: 9cf3600ff6 [formerly 4879520391] [formerly 9cf3600ff6 [formerly 4879520391] [formerly a7efde7cf4 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 311c8d67af [formerly 55440888fd]
Former-commit-id: af32adebc5
2014-03-26 15:51:32 -05:00
Brian.Dyke
e7aea77979 Fixed comment merge conflicts added .gitignore
Former-commit-id: 027cca8673 [formerly 7cc471a9c9] [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 412a7eb2c2 [formerly d8256c4226]
Former-commit-id: c19fc33493
2014-03-25 15:41:58 -04:00
Brian.Dyke
2ba9b8825b OB_14.1.1-25 baseline
Former-commit-id: c085bc6879 [formerly c67833407c] [formerly c085bc6879 [formerly c67833407c] [formerly 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 95ada25b65 [formerly 36fdf6bfe4]
Former-commit-id: 05ab17425c
2014-03-25 13:55:54 -04:00
Richard Peter
631aa74a10 Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: 6236137635 [formerly 390e73af44] [formerly 6236137635 [formerly 390e73af44] [formerly 897980da08 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]
Former-commit-id: 897980da08
Former-commit-id: a910870531 [formerly 780b504251]
Former-commit-id: 9060aab6dd
2014-03-24 09:53:13 -05:00
Dave Hladky
a37f87968c Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 39343e1801 [formerly 3ac04dd071] [formerly 39343e1801 [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: e464a1d8f8 [formerly 43cbcff538]
Former-commit-id: 3d61ca32f6
2014-03-24 08:27:12 -05:00
Mike Duff
05fbcc61ca Issue #2941 - Sort data before returning
Former-commit-id: ff07b90659 [formerly 73a011b940] [formerly ff07b90659 [formerly 73a011b940] [formerly 4db73e42a5 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]
Former-commit-id: 4db73e42a5
Former-commit-id: 8d1347d1f7 [formerly 43eccead7c]
Former-commit-id: 8f00b37688
2014-03-24 08:19:21 -05:00
Brian.Dyke
aea0544eec Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 50e5f4f78d [formerly 06ee9a6384] [formerly 50e5f4f78d [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: d97b88f433 [formerly 14567f20a7]
Former-commit-id: f540c6fb2d
2014-03-24 07:01:29 -04:00
Brian.Dyke
7aeb9af309 OB_14.1.1-24 baseline
Former-commit-id: 37e9d48d45 [formerly 37b6368268] [formerly 37e9d48d45 [formerly 37b6368268] [formerly face1ebeeb [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: cfa058a345 [formerly 6b2175da93]
Former-commit-id: 2fda566cfb
2014-03-21 12:43:50 -04:00
Ben Steffensmeier
ebd80c4d49 Issue #2932 improve compatibility of pop skewT and blended resources.
Former-commit-id: 14907292da [formerly 933b172ca0] [formerly 14907292da [formerly 933b172ca0] [formerly effb0bfcd8 [formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]]]
Former-commit-id: effb0bfcd8
Former-commit-id: 99d9ba9645 [formerly ee3cb7e69a]
Former-commit-id: b8d6663e15
2014-03-20 13:18:40 -05:00
Nate Jensen
8ac503de37 Issue #2919 fix windows error due to gempak library missing
Former-commit-id: 6edec10edc [formerly 747ac58166] [formerly 6edec10edc [formerly 747ac58166] [formerly 82ee3e7104 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]]
Former-commit-id: 82ee3e7104
Former-commit-id: 07d2a4f40c [formerly 24eadadffd]
Former-commit-id: 557c180e6d
2014-03-20 09:38:07 -05:00
steve.naples
f0b105bbdf ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204

Former-commit-id: 64b19f2e41 [formerly d0f4df4ad9] [formerly 64b19f2e41 [formerly d0f4df4ad9] [formerly 1aa970164f [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]
Former-commit-id: 1aa970164f
Former-commit-id: 885ceb834b [formerly 9c9ddaba6a]
Former-commit-id: 47e1a3627f
2014-03-19 18:16:41 +00:00
Juliya Dynina
668c24997d Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
Former-commit-id: 34b6972f79 [formerly 9aa170ca5f] [formerly 34b6972f79 [formerly 9aa170ca5f] [formerly 7a14dfb5a9 [formerly 8f842b0defba552ebbbe980b42dfb7618a2a7ccd]]]
Former-commit-id: 7a14dfb5a9
Former-commit-id: f4c1f51b2c [formerly e939d718e5]
Former-commit-id: b5c93d06e6
2014-03-18 13:52:48 -05:00
steve.naples
2d22f976f4 ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6

Former-commit-id: 46675eec43 [formerly 309ff4e7f7] [formerly 46675eec43 [formerly 309ff4e7f7] [formerly 75e8a907fe [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]]]
Former-commit-id: 75e8a907fe
Former-commit-id: 2ff30dac48 [formerly 54cc3397ee]
Former-commit-id: 72d6b1f1a5
2014-03-18 15:40:13 +00:00
Juliya Dynina
5505320aa3 Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
Former-commit-id: 30545f79c5 [formerly 85fd3b3888] [formerly 30545f79c5 [formerly 85fd3b3888] [formerly ef873880b6 [formerly 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0]]]
Former-commit-id: ef873880b6
Former-commit-id: bd6ae766c2 [formerly 67f8f79e9f]
Former-commit-id: cc3e0b3360
2014-03-18 08:47:22 -05:00
Juliya Dynina
de68dcfeb4 Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: d6e2b7f741 [formerly c735051e00] [formerly d6e2b7f741 [formerly c735051e00] [formerly 867f00b438 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]]
Former-commit-id: 867f00b438
Former-commit-id: ed07060240 [formerly c54631024a]
Former-commit-id: d34b5c1a2c
2014-03-18 08:13:51 -05:00
David Friedman
cf85796def ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5

Former-commit-id: fd203b5999 [formerly 15ca9f4dcc] [formerly fd203b5999 [formerly 15ca9f4dcc] [formerly decdadce01 [formerly 0a94094f0f140de68da634cbc6c79039507712ca]]]
Former-commit-id: decdadce01
Former-commit-id: f19895db07 [formerly 9beaf9be16]
Former-commit-id: 5fe3990a9e
2014-03-18 13:12:40 +00:00
Qinglu.Lin
119fc9840e ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05

Former-commit-id: 09e90dfe43 [formerly 4b3c821ce0] [formerly 09e90dfe43 [formerly 4b3c821ce0] [formerly af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]
Former-commit-id: af82143e84
Former-commit-id: 1b352b8600 [formerly bd7d68bd16]
Former-commit-id: 72b8b32e25
2014-03-17 18:17:49 -04:00
Steve Harris
a612c4e6dd Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 951c9b0d31 [formerly d087c8c31e] [formerly 951c9b0d31 [formerly d087c8c31e] [formerly 24fe6a248f [formerly 543090e28936ce680e21cda802cfac73ff31ca58]]]
Former-commit-id: 24fe6a248f
Former-commit-id: 5abea804af [formerly f878fe8729]
Former-commit-id: 6cc8f3a295
2014-03-17 15:53:31 -05:00
Matthew Howard
ab71d9e4d4 Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2
Former-commit-id: 30e8d76f50 [formerly c1433db0fb] [formerly 30e8d76f50 [formerly c1433db0fb] [formerly 1d15cda9fd [formerly 1b46d5c169709a9498a5eb9963286a6223089af4]]]
Former-commit-id: 1d15cda9fd
Former-commit-id: 4ec6bd0a21 [formerly 6b5bbb1270]
Former-commit-id: 930eb52d95
2014-03-14 19:47:32 -05:00
Rici.Yu
f32491f913 ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99

Former-commit-id: c559ade333 [formerly 74b1c827ee] [formerly c559ade333 [formerly 74b1c827ee] [formerly 58f9857344 [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]
Former-commit-id: 58f9857344
Former-commit-id: e877c81c88 [formerly 0ee8baf0c3]
Former-commit-id: 1684740d02
2014-03-14 14:39:56 -04:00
Brian.Dyke
5fb2fe9266 Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 9f332e938c [formerly d23acbdd48] [formerly 9f332e938c [formerly d23acbdd48] [formerly 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]
Former-commit-id: 9c412e444e
Former-commit-id: 57f7e4b084 [formerly 88efccf309]
Former-commit-id: 35427557c4
2014-03-14 11:13:30 -04:00
Brian.Dyke
92ed2895fb Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 24a63fb05a [formerly 030a18f804] [formerly 24a63fb05a [formerly 030a18f804] [formerly 30084d7f84 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]
Former-commit-id: 30084d7f84
Former-commit-id: 916fec5a4f [formerly 2109409b24]
Former-commit-id: f20020876a
2014-03-14 10:15:53 -04:00
Brian.Dyke
516ba8e81a Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 4e3096631d [formerly d4b6d22ae2] [formerly 4e3096631d [formerly d4b6d22ae2] [formerly f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]
Former-commit-id: f999e48df0
Former-commit-id: 82756e3855 [formerly 3ab2df3507]
Former-commit-id: 76271269c5
2014-03-14 08:44:39 -04:00
Brian.Dyke
be8f052cff OB_14.1.1-23 baseline
Former-commit-id: 55918ee421 [formerly dcc2e4fd61] [formerly 55918ee421 [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]
Former-commit-id: bc6a7bf946
Former-commit-id: e78e030b7c [formerly 8f72db144b]
Former-commit-id: c7fbd5dfe4
2014-03-14 08:18:16 -04:00
Kevin P. Johnson
90a9e642e3 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: e3a951da78 [formerly b2797a0788] [formerly e3a951da78 [formerly b2797a0788] [formerly 4c833d3389 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]
Former-commit-id: 4c833d3389
Former-commit-id: 32b372db4b [formerly 17a4229072]
Former-commit-id: eb12ec9c14
2014-03-13 20:42:12 +00:00
Ben Steffensmeier
1bde438f3a Issue #2528 Fix satellite units/style.
Former-commit-id: e6cd8b3167 [formerly 77041e5b17] [formerly e6cd8b3167 [formerly 77041e5b17] [formerly 75120a09cd [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]
Former-commit-id: 75120a09cd
Former-commit-id: e2995114dc [formerly d29daf8ede]
Former-commit-id: fc62e2679d
2014-03-12 14:19:49 -05:00
Juliya Dynina
a732e97bba Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2
Former-commit-id: 2a9de9706e [formerly 6ac6f6f1fc] [formerly 2a9de9706e [formerly 6ac6f6f1fc] [formerly b296595184 [formerly f28ab35657154bb028f3ca710ccc0b42d7c04b70]]]
Former-commit-id: b296595184
Former-commit-id: ced1197a83 [formerly ee8e55431b]
Former-commit-id: c2929b2bf3
2014-03-12 11:36:38 -05:00
Richard Peter
318c61b1bf Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: e981ce3e36 [formerly 18234c5d73] [formerly e981ce3e36 [formerly 18234c5d73] [formerly f59d1433db [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]
Former-commit-id: f59d1433db
Former-commit-id: cc35481b48 [formerly 76f15c73dd]
Former-commit-id: 937c89866d
2014-03-11 16:43:37 -05:00
Dave Hladky
78441a1250 Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: 7cd4304140 [formerly 3500ad262a] [formerly 7cd4304140 [formerly 3500ad262a] [formerly 76e216d319 [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]
Former-commit-id: 76e216d319
Former-commit-id: f3876233e4 [formerly 03fd32144a]
Former-commit-id: c0d2eb8f6b
2014-03-11 15:53:59 -05:00
Loubna.Bousaidi
1eb79ede56 ASM #380 - Hydro--TimeSeries:error thrown when click Table button
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09

Former-commit-id: 27447d7b76 [formerly 123007b18d] [formerly 27447d7b76 [formerly 123007b18d] [formerly ce2bea0a04 [formerly d2161a0fdd0bad7f8266a8b30659021edecaa549]]]
Former-commit-id: ce2bea0a04
Former-commit-id: b5cb73fd5a [formerly 6f7b1b6ca8]
Former-commit-id: 7eb94c4651
2014-03-11 18:58:26 +00:00
Nate Jensen
39d73f1569 Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
Former-commit-id: cef0438c35 [formerly 85f5821a6f] [formerly cef0438c35 [formerly 85f5821a6f] [formerly afbdf6962c [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]
Former-commit-id: afbdf6962c
Former-commit-id: 3411167042 [formerly 09f4bd9883]
Former-commit-id: be9744c6f9
2014-03-11 12:35:44 -05:00
David Gillingham
0e0fdae804 Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: e3a3cf7bad [formerly b0783b64ce] [formerly e3a3cf7bad [formerly b0783b64ce] [formerly 187196b519 [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]
Former-commit-id: 187196b519
Former-commit-id: 4179172d0e [formerly 68edb8d9a1]
Former-commit-id: f30292b471
2014-03-11 11:54:25 -05:00
Ben Steffensmeier
470ac4a1b9 Issue #2896 Fix sat best res on weird projections
Former-commit-id: c7fa392f3f [formerly 8bb517836a] [formerly c7fa392f3f [formerly 8bb517836a] [formerly 560fc688bc [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]
Former-commit-id: 560fc688bc
Former-commit-id: 7a06fdd71a [formerly b474e92189]
Former-commit-id: 30683880ee
2014-03-11 11:07:43 -05:00
Nate Jensen
391deee18c Issue #2779 update memory settings for renamed NC perspective
Former-commit-id: 17aa39ce0a [formerly ccb06db199] [formerly 17aa39ce0a [formerly ccb06db199] [formerly 5eb892f4cf [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 42c545804c [formerly 22ff235bcf]
Former-commit-id: 15a2fb216e
2014-03-11 10:28:01 -05:00
Brian.Dyke
b301ef8190 Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
Former-commit-id: fa16721854 [formerly 552490206f] [formerly fa16721854 [formerly 552490206f] [formerly fcc9115b0d [formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]]
Former-commit-id: fcc9115b0d
Former-commit-id: 3070b42ed3 [formerly 83822661e8]
Former-commit-id: fdaab3d981
2014-03-11 10:44:03 -04:00
Juliya Dynina
ddf1c4f4f6 Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: b3ec4c363f [formerly 6bbd88e62c] [formerly b3ec4c363f [formerly 6bbd88e62c] [formerly 7952862443 [formerly a167748b77baad66784893304a18e8866f5471f1]]]
Former-commit-id: 7952862443
Former-commit-id: bedc9082b0 [formerly 7e35f36651]
Former-commit-id: 7966aac771
2014-03-11 09:24:12 -05:00