Brian.Dyke
|
05c0e1ad1c
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 2a4fe3dbae [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: cccb3fd90675126650244cd85cd8a3341749bad8 [formerly 911c0c6c17]
Former-commit-id: 953236aad8
|
2014-04-23 14:05:50 -04:00 |
|
Brian.Dyke
|
ec3c3b4bbe
|
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 55d7d8dadb [formerly 53ce26a9b6] [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 1aec3b3698 [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 02f862c461e30bc6f080ca3c5fa4bbbfae2b54a2 [formerly 4eb3317f80]
Former-commit-id: 66974e17b9
|
2014-04-17 14:42:44 -04:00 |
|
Brian.Dyke
|
9c4385efbe
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]
Former-commit-id: 6f35818917
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
88231d9166
|
Issue #3018 addressing code review comments
Former-commit-id: f8f47a8bf7 [formerly 54951100af] [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly e327f5e0bf [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: febf7868548bff0878f5de8197de931a5e194ca9 [formerly 8b6650c898]
Former-commit-id: 81f8f6f328
|
2014-04-17 09:28:47 -05:00 |
|
Ron Anderson
|
8851b335fc
|
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: ef02928b92 [formerly 85a1f55ea0] [formerly f9a393172f] [formerly 1ba72371be [formerly f9a393172f [formerly 6813b32786289503950322c02e32803299566c5d]]]
Former-commit-id: 1ba72371be
Former-commit-id: 502045c662b12074a1036d22f9c1951ee22f1f8b [formerly 7d09397faa]
Former-commit-id: 2139c2308e
|
2014-04-16 18:02:11 -05:00 |
|
Nate Jensen
|
e4b0a48ace
|
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 97c48103d7 [formerly 781ec3ecd6] [formerly a085b71c81] [formerly c362af04f3 [formerly a085b71c81 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]
Former-commit-id: c362af04f3
Former-commit-id: 93fd911a8ce5140273cf8b6b105888dd69b75fea [formerly e1caa66625]
Former-commit-id: 1a40bc4824
|
2014-04-16 17:25:09 -05:00 |
|
Nate Jensen
|
17544a32ba
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]
Former-commit-id: 19f0be6afc
|
2014-04-16 16:17:05 -05:00 |
|
Ron Anderson
|
c263058e63
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]
Former-commit-id: 9f085a0856
Former-commit-id: 4b1dcfa5f1e94d0867e4b137f8e3643f96ecc196 [formerly 4622ad9b8a]
Former-commit-id: a6fa60f40d
|
2014-04-15 17:22:12 -05:00 |
|
brian.dyke
|
16a261d7f6
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 6575f77fe3 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]
Former-commit-id: a8d6d58f31
Former-commit-id: f4680f6e78d8dd9f6a0ede6791f8e2273054f211 [formerly ad63114f16]
Former-commit-id: 88ddd667b6
|
2014-04-11 10:58:48 -04:00 |
|
Brian.Dyke
|
70e228a893
|
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]
Former-commit-id: afc1da9015
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
47795836f2
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]
Former-commit-id: f1b85f6964
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
a6ebdbfc3a
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]
Former-commit-id: 929b736038
Former-commit-id: ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]
Former-commit-id: d76d3a26cb
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
824e1f6d14
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 518167e0bb [formerly 529059851a] [formerly 20fef0f15b] [formerly 79c7ec7ae9 [formerly 20fef0f15b [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]]]
Former-commit-id: 79c7ec7ae9
Former-commit-id: 05c5a8903cdbc8d381e7bf1456acac3943c3855e [formerly 538b02e42b]
Former-commit-id: 20c27a479d
|
2014-04-08 13:05:12 -04:00 |
|
Ben Steffensmeier
|
ffa4a7a73e
|
Issue #2973 Use correct area for expanding subgrid requests.
Former-commit-id: 4e60abfd33 [formerly 5b3a8dccbf] [formerly 90f1750691] [formerly 000f259cf4 [formerly 90f1750691 [formerly 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b]]]
Former-commit-id: 000f259cf4
Former-commit-id: f24e95d25af89a1897da1baf888c6a2256e1ca6b [formerly 7b2f82ff30]
Former-commit-id: d52be1875d
|
2014-04-04 13:17:36 -05:00 |
|
Brian.Dyke
|
8ba2694d8e
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: dd98c213c7
Former-commit-id: 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]
Former-commit-id: 47d9095211
|
2014-04-04 12:57:32 -04:00 |
|
steve.naples
|
86c06b5632
|
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 5d7cf6c098 [formerly 75be620d0d] [formerly f6636a3dd7] [formerly 7624f7ab75 [formerly f6636a3dd7 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]]
Former-commit-id: 7624f7ab75
Former-commit-id: 1cf8539d045c95be911973c6773035bb176dd49d [formerly 050238ee44]
Former-commit-id: cfa9c6f01c
|
2014-04-04 15:30:18 +00:00 |
|
Ron Anderson
|
5001c1f2be
|
Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]
Former-commit-id: d556055299
Former-commit-id: dec5605ca65dcc7794d7aa2a917294e93e71160b [formerly ac7c5460f6]
Former-commit-id: 3ac3d5de1b
|
2014-04-02 09:07:22 -05:00 |
|
Brian.Dyke
|
f5ed39a8d9
|
Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 6e515eb334 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: d9da3cc373b8f207d487dbe28227905b8a81846e [formerly c013460db1]
Former-commit-id: d163d9d190
|
2014-04-01 14:29:33 -04:00 |
|
David Friedman
|
1e4ac84f99
|
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: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]
Former-commit-id: 1168a3eae5
|
2014-03-27 19:17:03 +00:00 |
|
Brian.Dyke
|
bded86a35f
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]
Former-commit-id: 3b639347f8
Former-commit-id: 38694ae3f3f4b7b74544ffa190d887b7c937b26b [formerly 76625c2238]
Former-commit-id: 519ec3071a
|
2014-03-27 10:22:26 -04:00 |
|
Steve Harris
|
3b8569a1ac
|
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 9e1c5536bf5208e6e617f1b651bab6961954548a [formerly 55440888fd]
Former-commit-id: 311c8d67af
|
2014-03-26 15:51:32 -05:00 |
|
Brian.Dyke
|
6476c4fb85
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]
Former-commit-id: 412a7eb2c2
|
2014-03-25 15:41:58 -04:00 |
|
Brian.Dyke
|
5b848e5480
|
OB_14.1.1-25 baseline
Former-commit-id: c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly 074abeb0fa [formerly c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: ec4f283a91b4ae374dc7edc0c06351378f44b61f [formerly 36fdf6bfe4]
Former-commit-id: 95ada25b65
|
2014-03-25 13:55:54 -04:00 |
|
Brian.Dyke
|
402035e7f9
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: 1a63c19999c01830d72a5d605c2cc1247fc3b4eb [formerly 14567f20a7]
Former-commit-id: d97b88f433
|
2014-03-24 07:01:29 -04:00 |
|
Brian.Dyke
|
49f7c81de1
|
OB_14.1.1-24 baseline
Former-commit-id: 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: 96a438276ab6f5a4af7ac304e214e79258c0ea3d [formerly 6b2175da93]
Former-commit-id: cfa058a345
|
2014-03-21 12:43:50 -04:00 |
|
Ben Steffensmeier
|
4d284e5780
|
Issue #2932 improve compatibility of pop skewT and blended resources.
Former-commit-id: 12d5339c48 [formerly 14907292da] [formerly 933b172ca0] [formerly effb0bfcd8 [formerly 933b172ca0 [formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]]]
Former-commit-id: effb0bfcd8
Former-commit-id: 181bf9e15da48dfb7597e793bcef70990b517993 [formerly ee3cb7e69a]
Former-commit-id: 99d9ba9645
|
2014-03-20 13:18:40 -05:00 |
|
Nate Jensen
|
0dd42bbdc2
|
Issue #2919 fix windows error due to gempak library missing
Former-commit-id: a3220cf170 [formerly 6edec10edc] [formerly 747ac58166] [formerly 82ee3e7104 [formerly 747ac58166 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]]
Former-commit-id: 82ee3e7104
Former-commit-id: 8865ef5c8523a5ad4eab9d7ab74db2f4ee390b98 [formerly 24eadadffd]
Former-commit-id: 07d2a4f40c
|
2014-03-20 09:38:07 -05:00 |
|
steve.naples
|
8d9a51770d
|
ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: 20399400cb [formerly 64b19f2e41] [formerly d0f4df4ad9] [formerly 1aa970164f [formerly d0f4df4ad9 [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]
Former-commit-id: 1aa970164f
Former-commit-id: 5c8cd26c00210e720cf38e0d3c939e91ef07f9f2 [formerly 9c9ddaba6a]
Former-commit-id: 885ceb834b
|
2014-03-19 18:16:41 +00:00 |
|
Juliya Dynina
|
5f3c6c617e
|
Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: 0691c153f7 [formerly d6e2b7f741] [formerly c735051e00] [formerly 867f00b438 [formerly c735051e00 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]]
Former-commit-id: 867f00b438
Former-commit-id: f3ff22bda2c35c61c7a757023a9acddcadcbc749 [formerly c54631024a]
Former-commit-id: ed07060240
|
2014-03-18 08:13:51 -05:00 |
|
Qinglu.Lin
|
2b4ab71782
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: a62e75e8b5 [formerly 09e90dfe43] [formerly 4b3c821ce0] [formerly af82143e84 [formerly 4b3c821ce0 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]
Former-commit-id: af82143e84
Former-commit-id: a5da7a6ab2edf30dc691e926f832381fb33cc183 [formerly bd7d68bd16]
Former-commit-id: 1b352b8600
|
2014-03-17 18:17:49 -04:00 |
|
Steve Harris
|
78afbbe325
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 2db52dab8e [formerly 951c9b0d31] [formerly d087c8c31e] [formerly 24fe6a248f [formerly d087c8c31e [formerly 543090e28936ce680e21cda802cfac73ff31ca58]]]
Former-commit-id: 24fe6a248f
Former-commit-id: a54cf16be99c26422929ca49bb4ae500bc503e48 [formerly f878fe8729]
Former-commit-id: 5abea804af
|
2014-03-17 15:53:31 -05:00 |
|
Matthew Howard
|
164c6d6003
|
Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2
Former-commit-id: b1bf3db462 [formerly 30e8d76f50] [formerly c1433db0fb] [formerly 1d15cda9fd [formerly c1433db0fb [formerly 1b46d5c169709a9498a5eb9963286a6223089af4]]]
Former-commit-id: 1d15cda9fd
Former-commit-id: 7661cebb31c2c2ec1e71eb1058895b1e4789c68a [formerly 6b5bbb1270]
Former-commit-id: 4ec6bd0a21
|
2014-03-14 19:47:32 -05:00 |
|
Rici.Yu
|
a3e865e011
|
ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99
Former-commit-id: 777bd46d68 [formerly c559ade333] [formerly 74b1c827ee] [formerly 58f9857344 [formerly 74b1c827ee [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]
Former-commit-id: 58f9857344
Former-commit-id: 8ff482b2584775bc71dc4df96949f7260608e124 [formerly 0ee8baf0c3]
Former-commit-id: e877c81c88
|
2014-03-14 14:39:56 -04:00 |
|
Brian.Dyke
|
024d49d48b
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 30084d7f84 [formerly 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]
Former-commit-id: 30084d7f84
Former-commit-id: ef3d48a76a5bbff4e7d32e4ab3916273c583f0ec [formerly 2109409b24]
Former-commit-id: 916fec5a4f
|
2014-03-14 10:15:53 -04:00 |
|
Brian.Dyke
|
86ec9a50d4
|
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: a68bda6858 [formerly 4e3096631d] [formerly d4b6d22ae2] [formerly f999e48df0 [formerly d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]
Former-commit-id: f999e48df0
Former-commit-id: 2bdb02ad2c8ccb7c77ded0fd2df41688dea93867 [formerly 3ab2df3507]
Former-commit-id: 82756e3855
|
2014-03-14 08:44:39 -04:00 |
|
Kevin P. Johnson
|
54316530e4
|
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: c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly 4c833d3389 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]
Former-commit-id: 4c833d3389
Former-commit-id: 6cd2437734cdee7992443a141d1ae3334e20f72d [formerly 17a4229072]
Former-commit-id: 32b372db4b
|
2014-03-13 20:42:12 +00:00 |
|
Juliya Dynina
|
1c14f20643
|
Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2
Former-commit-id: ccb6ccaf2e [formerly 2a9de9706e] [formerly 6ac6f6f1fc] [formerly b296595184 [formerly 6ac6f6f1fc [formerly f28ab35657154bb028f3ca710ccc0b42d7c04b70]]]
Former-commit-id: b296595184
Former-commit-id: 4a937d1367fc3b94819005e556bba210c664b8c2 [formerly ee8e55431b]
Former-commit-id: ced1197a83
|
2014-03-12 11:36:38 -05:00 |
|
Loubna.Bousaidi
|
0a5dd21ea9
|
ASM #380 - Hydro--TimeSeries:error thrown when click Table button
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09
Former-commit-id: 3a29602f9d [formerly 27447d7b76] [formerly 123007b18d] [formerly ce2bea0a04 [formerly 123007b18d [formerly d2161a0fdd0bad7f8266a8b30659021edecaa549]]]
Former-commit-id: ce2bea0a04
Former-commit-id: de3471a825bb008a8c6b4d7deb2d610059ce27a7 [formerly 6f7b1b6ca8]
Former-commit-id: b5cb73fd5a
|
2014-03-11 18:58:26 +00:00 |
|
Nate Jensen
|
fd0a81a181
|
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
Former-commit-id: a9811bdb2c [formerly cef0438c35] [formerly 85f5821a6f] [formerly afbdf6962c [formerly 85f5821a6f [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]
Former-commit-id: afbdf6962c
Former-commit-id: 2ac85b86fee6285f476e7194d549ae07555767d9 [formerly 09f4bd9883]
Former-commit-id: 3411167042
|
2014-03-11 12:35:44 -05:00 |
|
Ben Steffensmeier
|
20b99bc6c5
|
Issue #2896 Fix sat best res on weird projections
Former-commit-id: a9c4875038 [formerly c7fa392f3f] [formerly 8bb517836a] [formerly 560fc688bc [formerly 8bb517836a [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]
Former-commit-id: 560fc688bc
Former-commit-id: 3dd12b4d2d8faad952b606b3c39220f5602545d4 [formerly b474e92189]
Former-commit-id: 7a06fdd71a
|
2014-03-11 11:07:43 -05:00 |
|
Nate Jensen
|
219f232fcb
|
Issue #2779 update memory settings for renamed NC perspective
Former-commit-id: ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly 5eb892f4cf [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: dc64b4c9b5a35e0a38967549f2d086cd34c1fedf [formerly 22ff235bcf]
Former-commit-id: 42c545804c
|
2014-03-11 10:28:01 -05:00 |
|
brian.dyke
|
41a37605d4
|
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: 9bef04b7d89a16100ee76d159ab4225ead55540a [formerly d57a3dd24c]
Former-commit-id: d1b389ae05
|
2014-03-10 15:36:56 -04:00 |
|
steve.naples
|
f7cfc3392a
|
ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch.
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97
Former-commit-id: a687ff690a [formerly 0d44e46f88] [formerly 212677f94b] [formerly 20582ab173 [formerly 212677f94b [formerly cd7d6876338b98c320a8d7559c518e32e90e3000]]]
Former-commit-id: 20582ab173
Former-commit-id: 9647562d19e590ca239f9cbc61e484c2e6323119 [formerly 488d87dbe4]
Former-commit-id: 38fca1641f
|
2014-03-10 17:47:25 +00:00 |
|
steve.naples
|
3da7f90763
|
ASM #336 MPEFieldResource updated to add case for PRISM data unit conversion.
Change-Id: I8f129902079c051ca4fb508e43b8bf892cb19e0e
Former-commit-id: e7d6b6d08b [formerly c877c8b61b] [formerly 915e3c2c66] [formerly 7432b146ed [formerly 915e3c2c66 [formerly 482547a4f4eaff0fc24b6d3f1103a38a9f3aa314]]]
Former-commit-id: 7432b146ed
Former-commit-id: a4c90943789c41fe516b27147c94972a79097682 [formerly 796ba75949]
Former-commit-id: 36e3819aad
|
2014-03-10 17:40:35 +00:00 |
|
Nate Jensen
|
d32d855bb2
|
Issue #2779 add .ini generation of memory settings for other components
Former-commit-id: b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly d599db4af2 [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]
Former-commit-id: d599db4af2
Former-commit-id: 097c1a455c355cc0ebe8f7b95797516bfc05c8c6 [formerly 5094008bea]
Former-commit-id: 39aa26c2b6
|
2014-03-10 10:03:02 -05:00 |
|
Steve Harris
|
a94f800324
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]
Former-commit-id: 4d1fbf8743
|
2014-03-07 15:16:18 -06:00 |
|
Shawn.Hooper
|
e33de27296
|
ASM #378 - MPE gages are not listed/available in gage table
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: fb051c5a5f [formerly b46b87cb5e] [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 8c9f9b3ae0 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]
Former-commit-id: dc3aadd149
Former-commit-id: f304d2fa3946f5a199255a03597cdc0f3f79d636 [formerly 05bb380e77]
Former-commit-id: 68d8f9be14
|
2014-03-07 12:57:36 -05:00 |
|
Brian.Dyke
|
eb6abe6faa
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: e502d460a99724c0ff3efb14c8d0f8d731aad320 [formerly 6ced1bedc2]
Former-commit-id: fa189c0ef6
|
2014-03-07 09:01:09 -05:00 |
|
Brian.Dyke
|
50621ec3e5
|
Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 1e0890d0f70a0aeffbbcabd7f8be3e396daae297 [formerly 2f94480121]
Former-commit-id: 2eec413d72
|
2014-03-07 08:57:07 -05:00 |
|
Brian.Dyke
|
3c9cde458a
|
14.1.1-22 baseline
Former-commit-id: 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: f1658f5e11228e084b4f3ed536ccf891c20f621a [formerly a4c136fd60]
Former-commit-id: 9406a1d6c0
|
2014-03-07 08:49:00 -05:00 |
|