Ron Anderson
e362632eca
Issue #1708 Fix redundant excution of evaluateQuery.
...
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a
Former-commit-id: db805e2097
[formerly 2212f333a3
] [formerly 8e1422f65ea479fdf23ed44e51e4289779d73417 [formerly a5a273c1c2
]] [formerly 274ce762d8
[formerly a5a273c1c2
[formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]]
Former-commit-id: 274ce762d8
Former-commit-id: b2dd338df0ca4db81b2171b950912c2d66219f23 [formerly 84bd642290
]
Former-commit-id: 93382aeed8
2013-02-26 19:00:56 -06:00
Ron Anderson
dc8d1dd95c
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: 547f0d086f
[formerly d43afc8c67
] [formerly bfe3c684df
] [formerly f37999b1eb
[formerly bfe3c684df
[formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: bf9a2b39ec50125619129c86673eb152b84b87e6 [formerly 77fbbb6a61
]
Former-commit-id: 541557e0b0
2013-02-26 18:44:51 -06:00
Nate Jensen
ec7eecbb4f
Merge "Issue #1642 : Fix QPID Deadlock scenario - Address peer review comments" into development
...
Former-commit-id: 0cd78444b8
[formerly a020438c99
] [formerly 58957d30e5
] [formerly 24c94ef55b
[formerly 58957d30e5
[formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]]
Former-commit-id: 24c94ef55b
Former-commit-id: e65c9fe57e543cc92e2c686a843d870e73f0bdb8 [formerly b6fc51a18c
]
Former-commit-id: 652ac25d12
2013-02-26 18:00:50 -06:00
Richard Peter
0b51936566
Issue #1642 : Fix QPID Deadlock scenario
...
- Address peer review comments
Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462
Former-commit-id: 3e5ab03ecf
[formerly 7d4206420c
] [formerly 9a0177861f
] [formerly 5b2650599d
[formerly 9a0177861f
[formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]]
Former-commit-id: 5b2650599d
Former-commit-id: 34da74ced85f0f692350cc266348ad7532e0abff [formerly 4deaf372a1
]
Former-commit-id: ea806139d3
2013-02-26 16:01:25 -06:00
Dustin Johnson
c23b8a58c3
Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
...
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7
Former-commit-id: 1d9690f299
[formerly 8038b840d8
] [formerly 7852f88352
] [formerly 88a9b953b6
[formerly 7852f88352
[formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]
Former-commit-id: 88a9b953b6
Former-commit-id: 188d47a162860963a3b8ee6af04bd72c07f6168a [formerly cc0254ba03
]
Former-commit-id: 94300e0c1d
2013-02-26 15:06:04 -06:00
Lee Venable
923e4b413e
Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development
...
Former-commit-id: 41820c3632
[formerly a4b41e0309
] [formerly 9cf3ca07b7
] [formerly 46ff81108a
[formerly 9cf3ca07b7
[formerly 26fa358838588643c003287d8125e58949c3648f]]]
Former-commit-id: 46ff81108a
Former-commit-id: eb05278da104f386aa87461ec56cd8a9b2591419 [formerly cb7fd87715
]
Former-commit-id: 4212af7e8a
2013-02-26 14:11:35 -06:00
Mike Duff
9af05ad9b2
Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down
...
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff
Former-commit-id: dda044a519
[formerly fdd5e903c6
] [formerly b48e70fff4
] [formerly c77602652e
[formerly b48e70fff4
[formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]]]
Former-commit-id: c77602652e
Former-commit-id: 1f9618136922328b8ba3926387a2723b1af8659d [formerly 3071eb8456
]
Former-commit-id: 882c46dd85
2013-02-26 14:03:55 -06:00
Nate Jensen
5853f48992
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: eb2e9f64f4
[formerly 15c4c4dfa0
] [formerly b062299796
] [formerly 36d4eff2c6
[formerly b062299796
[formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: 6b86c197517307ff2a80b25f90eb928605a06ecd [formerly 5c33098315
]
Former-commit-id: b173d34ba9
2013-02-26 13:53:40 -06:00
Nate Jensen
a336b044bb
Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
...
Former-commit-id: 5ecc23350c
[formerly f5ebeb1330
] [formerly 1e50b3a0e8
] [formerly 4e60fa682d
[formerly 1e50b3a0e8
[formerly 698d1d88b5c67498046dcec558361797a01b07f5]]]
Former-commit-id: 4e60fa682d
Former-commit-id: 23d5874d2070097f18269874ad648fd0961e9e33 [formerly e1660e51f8
]
Former-commit-id: 2b81ce6028
2013-02-26 13:46:30 -06:00
Dustin Johnson
78d88f4517
Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
...
Former-commit-id: 5f4301cb7f
[formerly 074fb0aa64
] [formerly 47cb278c01
] [formerly d31392d740
[formerly 47cb278c01
[formerly bf86849d284696553ed4cbc3f347afe2f791968d]]]
Former-commit-id: d31392d740
Former-commit-id: c8e8c462b09d5dae42fc85b112751c19ae6721cd [formerly a7d4b23597
]
Former-commit-id: 8e4a990d1a
2013-02-26 13:41:46 -06:00
Dustin Johnson
df02d5d97d
Merge "Issue #1643 Add NCF bandwidth manager router" into development
...
Former-commit-id: 256e2076a2
[formerly 50b412b34e
] [formerly 42402c5d73
] [formerly fb235e3f43
[formerly 42402c5d73
[formerly e2bb08df9a9aa2ac143e0f7fc82b911f72b4b87c]]]
Former-commit-id: fb235e3f43
Former-commit-id: a78f2da83b324e23865f0b4f3aa9e968cc1e0fcc [formerly a648519673
]
Former-commit-id: 4153bdd79e
2013-02-26 13:41:36 -06:00
Dustin Johnson
6e3dfd6764
Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
...
Former-commit-id: ab8506bab4
[formerly 3dd36d29cf
] [formerly fb38cceecd
] [formerly 76738dbf7d
[formerly fb38cceecd
[formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]]
Former-commit-id: 76738dbf7d
Former-commit-id: b84a0916484c6fa68206e55b951062f4706a545c [formerly b77ebdc924
]
Former-commit-id: bb5f6cc568
2013-02-26 13:37:14 -06:00
Matt Nash
9ac60409d6
Issue #1668 add gsd pattern to allow for their plugins to be deployed
...
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: 9dc4390b7e
[formerly 41bbd4cf2d
] [formerly a2fb0db684
] [formerly 051b36ad73
[formerly a2fb0db684
[formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]]
Former-commit-id: 051b36ad73
Former-commit-id: ae09dddec53fb271e50dd90fd45b73f94ff690be [formerly b1fe380c44
]
Former-commit-id: 32096feba8
2013-02-26 13:29:04 -06:00
Matt Nash
ac795d4948
Issue #1506 fix deadlock and edit areas showing up from query
...
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49
Former-commit-id: f18955a1ed
[formerly 4be89bdd43
] [formerly c728f72ea3
] [formerly b749edca54
[formerly c728f72ea3
[formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]]
Former-commit-id: b749edca54
Former-commit-id: 7fd44919b46c967d986955013a9d92fff46bb8e8 [formerly 51e6302178
]
Former-commit-id: daea84a1e8
2013-02-26 12:20:08 -06:00
Dustin Johnson
c606b31379
Issue #1592 Don't submit adhoc query when X button clicked
...
Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279
Former-commit-id: 0ba5133583
[formerly 604a7c82b2
] [formerly 598eb88a04
] [formerly c6975aa379
[formerly 598eb88a04
[formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]]
Former-commit-id: c6975aa379
Former-commit-id: 3f87c958340fba7c8c1875d78e5925e2eb83506a [formerly ab1dc2272b
]
Former-commit-id: 898d7500aa
2013-02-26 12:07:36 -06:00
Dustin Johnson
e6d447b00d
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: eaa295dddb
[formerly ebf02481f0
] [formerly d58d28c636
] [formerly 722e41b8b0
[formerly d58d28c636
[formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]
Former-commit-id: 722e41b8b0
Former-commit-id: 1fb58b752e38ec55f49ddf711fd9f47baf778025 [formerly cf86c92fad
]
Former-commit-id: 219e882fc5
2013-02-26 11:32:03 -06:00
Steve Harris
e48cc61522
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 82d50b3eb6
[formerly 7ed1eacb6b
] [formerly 9bcabe2c5d
] [formerly 098b1e1579
[formerly 9bcabe2c5d
[formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]]
Former-commit-id: 098b1e1579
Former-commit-id: becf9f6f60e4c46d8479291d783adafb70f1f495 [formerly 57440abebb
]
Former-commit-id: 41e1594be7
2013-02-25 20:41:26 -06:00
Richard Peter
6f6c1b22c4
Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
...
Former-commit-id: 2a69ad78b6
[formerly 2553955249
] [formerly be9370576a
] [formerly 1669945cdb
[formerly be9370576a
[formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]]
Former-commit-id: 1669945cdb
Former-commit-id: 8cf852aa069619e371c2c57b44205b3c23c5a9cc [formerly aa5f3c80a0
]
Former-commit-id: 56771955b4
2013-02-25 17:47:14 -06:00
Richard Peter
b5205f6b13
Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
...
Former-commit-id: 2e15dd3a75
[formerly af33dd1743
] [formerly b98bdb3d81
] [formerly 3b718bea52
[formerly b98bdb3d81
[formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]]
Former-commit-id: 3b718bea52
Former-commit-id: 7ce74c902674348f2cef516514b2f29b684f8bc2 [formerly c21a1e9f61
]
Former-commit-id: 25909b2ee1
2013-02-25 17:46:26 -06:00
Lee Venable
7fb13648f0
Merge "Issue #1625 Updated addOrRemoveCounty method." into development
...
Former-commit-id: 0be080c78b
[formerly e54eb4ab55
] [formerly e024e4e087
] [formerly 7f769af427
[formerly e024e4e087
[formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]]
Former-commit-id: 7f769af427
Former-commit-id: 0ab76cc18f600944e9a5f7f710dd240e73c4737f [formerly 0125935a7f
]
Former-commit-id: 444a1f5d47
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
c62a02700a
Issue #1625 Updated addOrRemoveCounty method.
...
Former-commit-id: 4ee3a8d412
[formerly f59a08963c
] [formerly cd6dd3c178
] [formerly 8c2c7c97f7
[formerly cd6dd3c178
[formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: 98a2ef23744e01ccb963e6b3513b3786a6c91d5c [formerly d4f4832d1a
]
Former-commit-id: c861c71ae6
2013-02-25 17:15:09 -06:00
Ben Steffensmeier
b534254207
Issue #1659 Stop derived parameters from sending empty requests for cached times
...
Former-commit-id: ab23c25b35
[formerly ff232b87b4
] [formerly 71652af086
] [formerly 9edeadc966
[formerly 71652af086
[formerly 9605118022d378eb35c38d784729410d160d46df]]]
Former-commit-id: 9edeadc966
Former-commit-id: aa80a8187de2e4d543605366748b0f19a7a88e41 [formerly d6c59cb85a
]
Former-commit-id: 9ec0008743
2013-02-25 17:08:12 -06:00
Ben Steffensmeier
483cff49ba
Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests.
...
Former-commit-id: 92954639db
[formerly f56b305581
] [formerly fd2450c0df
] [formerly 2fa5fb488e
[formerly fd2450c0df
[formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]]
Former-commit-id: 2fa5fb488e
Former-commit-id: 68f149d87e2b399b7952382baa7c61797a67f3a4 [formerly e1e7a12ca2
]
Former-commit-id: 5e1b9383a5
2013-02-25 16:58:25 -06:00
Nate Jensen
666f38eb64
Merge "Issue #1659 Cache station in StationUtils" into development
...
Former-commit-id: 02b52de3ce
[formerly c7d01eb0c5
] [formerly bbbdc17c06
] [formerly 66e1411de1
[formerly bbbdc17c06
[formerly 70f064bed284629fe521ac8d3596cb8ac798c0c7]]]
Former-commit-id: 66e1411de1
Former-commit-id: 763f66512c91a8e39853e4872f2284081df92ee7 [formerly 135006ff0c
]
Former-commit-id: 7201499124
2013-02-25 16:56:55 -06:00
Ben Steffensmeier
abe93c1f6e
Issue #1659 Cache station in StationUtils
...
Former-commit-id: 98ec05e12c
[formerly 0ff907499c
] [formerly 842437870e
] [formerly 39bf907df7
[formerly 842437870e
[formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]]
Former-commit-id: 39bf907df7
Former-commit-id: 9e36b2f9b09d3f4dc4f9cdf074839d358f49c86a [formerly 5be0eab696
]
Former-commit-id: 8ebeb61cea
2013-02-25 16:25:55 -06:00
Steve Harris
e4b9ef2cd3
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: 650db426b9
[formerly cd99e680bb
] [formerly b50e384a0f
] [formerly e8135b9c14
[formerly b50e384a0f
[formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]
Former-commit-id: e8135b9c14
Former-commit-id: 516b4ee30c97e99a87f971673c76dd8b45556e63 [formerly 2398ef1e85
]
Former-commit-id: 901cbbf56d
2013-02-25 16:05:22 -06:00
Steve Harris
f30d1cdf87
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 90b0bab156
[formerly 0a4564eb97
] [formerly 67f090638f
] [formerly 6ec9e73035
[formerly 67f090638f
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1
]
Former-commit-id: e46625f8f2
2013-02-25 15:58:48 -06:00
Steve Harris
9e33e5aed0
13.3.1-3 baseline
...
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1
conflicts resolved by 'theirs' strategy (all of 13.3.1-10)
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 786642589b
[formerly 07167ec04f
] [formerly cf951785c8
] [formerly db761c0f19
[formerly cf951785c8
[formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]]
Former-commit-id: db761c0f19
Former-commit-id: e1e30a87bbefe4ace1cec506478f31b1c194a07f [formerly 62e15dacdb
]
Former-commit-id: 988430b44d
2013-02-25 15:54:24 -06:00
Mike Duff
f73faee133
Issue #1588 - Fix match any/all in data browser dialog
...
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49
Former-commit-id: af47a02e47
[formerly 0d2c817680
] [formerly d00a790d7b
] [formerly 086d24acc8
[formerly d00a790d7b
[formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]]
Former-commit-id: 086d24acc8
Former-commit-id: f34a7712b345b1738f4e1c4927c8c43d0e321466 [formerly 1365596d4d
]
Former-commit-id: dccb6b94b9
2013-02-25 15:53:55 -06:00
Bryan Kowal
f4bf7e1adb
Issue #1634 - fix EDEX debug with YAJSW Wrapper
...
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: 1ea7fbe69e
[formerly 4d160993fb
] [formerly b05073fbe3
] [formerly 0d2262c0bf
[formerly b05073fbe3
[formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: 090c61777cb5dad1fa90214f62e271692c5b167e [formerly 36a887416f
]
Former-commit-id: f8c920c6cd
2013-02-25 11:30:13 -06:00
Dustin Johnson
6b5fdb5672
Merge "Issue #1620 - Fix set clean issue with job loader." into development
...
Former-commit-id: 81c261936f
[formerly 79718b6a9c
] [formerly 83a915210d
] [formerly eff20112d2
[formerly 83a915210d
[formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]]
Former-commit-id: eff20112d2
Former-commit-id: 77de144645b1acb61a1f55f57de766de97e3ddb8 [formerly 1255b87e2e
]
Former-commit-id: b702146272
2013-02-25 09:43:19 -06:00
Nate Jensen
2924ef9340
Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
...
Former-commit-id: 4f3ed0ef67
[formerly 5d7edbc0c1
] [formerly b514792bbc
] [formerly 5d828d4d62
[formerly b514792bbc
[formerly 1fec56c55d81b35df45c2266fc234747df3791df]]]
Former-commit-id: 5d828d4d62
Former-commit-id: d6b5c39b47f714b55716489494afc5902a140ab1 [formerly cb37bab362
]
Former-commit-id: 3a66566610
2013-02-25 09:31:55 -06:00
Nate Jensen
32f74cfe32
Merge "Issue #1628 lower Xmx on windows in awips.product." into development
...
Former-commit-id: df11a1bc40
[formerly ae20ee7665
] [formerly c1becf797a
] [formerly 545caf22fb
[formerly c1becf797a
[formerly 8525b4ac1db570160253cf7bb180914967e0b647]]]
Former-commit-id: 545caf22fb
Former-commit-id: d31418ec7c77062c9087ed4434fdf6776b2c9630 [formerly 87a745eb2f
]
Former-commit-id: 530d3bfa00
2013-02-25 09:31:20 -06:00
Mike Duff
5439b30b6a
Issue #1552 - Implement FFMP Data Access
...
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 018953526b
[formerly 8a8e8f7a73
] [formerly 8bddd467b1
] [formerly 81649d346a
[formerly 8bddd467b1
[formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]
Former-commit-id: 81649d346a
Former-commit-id: 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f
]
Former-commit-id: 01ef273417
2013-02-25 09:29:16 -06:00
Steve Harris
30efc4c86a
13.3.1-3 baseline
...
Former-commit-id: 4a0eea00b5
[formerly a55f438dd8
] [formerly 6572452887
] [formerly 8a64f142e5
[formerly 6572452887
[formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]
Former-commit-id: 8a64f142e5
Former-commit-id: ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3
]
Former-commit-id: 05eb25f124
2013-02-25 10:24:53 -05:00
Steve Harris
f2428e968a
13.3.1-2 baseline
...
Former-commit-id: 0b3acc0130
[formerly 3e60b23072
] [formerly df6d6f598e
] [formerly 3d115ed3be
[formerly df6d6f598e
[formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780
]
Former-commit-id: 370ed98038
2013-02-25 10:18:36 -05:00
Mike Duff
421a832657
Issue #1620 - Fix set clean issue with job loader.
...
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028
Former-commit-id: 6753072acf
[formerly bfc1e66dfb
] [formerly af8b97cd3c
] [formerly 3340a9ddd8
[formerly af8b97cd3c
[formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]]
Former-commit-id: 3340a9ddd8
Former-commit-id: 55cd27a63897002d693beca349d622a730a08c37 [formerly c904dc42ef
]
Former-commit-id: 9e177f44cd
2013-02-24 19:13:57 -06:00
Roger Ferrel
82804ac8bb
Issue #1442 Fix null pointer exception in DecisonTree's searchTree
...
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef
Former-commit-id: 4337d23872
[formerly 07a103c3bb
] [formerly 152715160e
] [formerly 09b5996dac
[formerly 152715160e
[formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]]
Former-commit-id: 09b5996dac
Former-commit-id: 3f8334cdb8bbe5133624435d74cf48b95e4f2493 [formerly fd95a99596
]
Former-commit-id: 186c71e5ac
2013-02-22 12:49:53 -06:00
Dustin Johnson
637c7e62c2
Issue #1543 Make DAOs public
...
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a
Former-commit-id: 5a4dd6fbd1
[formerly d4186178af
] [formerly 06b7697553
] [formerly 0743782772
[formerly 06b7697553
[formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]]
Former-commit-id: 0743782772
Former-commit-id: 0129926124bc6953a319174f4ae9c67d11da1444 [formerly 4e87912a9c
]
Former-commit-id: a1df296e80
2013-02-22 12:22:43 -06:00
Bryan Kowal
ec53fa98cd
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 6f419ae22f
[formerly 4cd5453e0a
] [formerly 7c62991edf
] [formerly d5c8b82941
[formerly 7c62991edf
[formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]
Former-commit-id: d5c8b82941
Former-commit-id: e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010
]
Former-commit-id: 53b9e69868
2013-02-22 09:28:37 -06:00
Ben Steffensmeier
3dd76fdb04
Issue #1617 fixed vb sounding point selection for points which contain the word Point
...
Former-commit-id: 581c8ffcd5
[formerly be95659d4a
] [formerly 1d8ad288b4
] [formerly 5701309bcb
[formerly 1d8ad288b4
[formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]]
Former-commit-id: 5701309bcb
Former-commit-id: fded4c4c5e2d488ca4c56730b284454ede5f92c1 [formerly 7c0f1bf788
]
Former-commit-id: 2892e64677
2013-02-21 16:28:41 -06:00
Steve Harris
7e48d3e684
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: abdc733151
[formerly 64744fdb19
] [formerly a0573644c4
] [formerly 2641d578e2
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1
]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Ben Steffensmeier
45bde9d742
Issue #1628 lower Xmx on windows in awips.product.
...
Former-commit-id: cb45175375
[formerly 86f30a647d
] [formerly 62eaf8e947
] [formerly 0bb2c03a83
[formerly 62eaf8e947
[formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]]
Former-commit-id: 0bb2c03a83
Former-commit-id: 8b8fa33b6ea614af1b029854cb81e6b6be529d48 [formerly 4209a3cfb1
]
Former-commit-id: dd2d3da9bb
2013-02-21 14:30:41 -06:00
Bryan Kowal
6a47017449
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 0d4a63efe4
[formerly 519ce2c0fb
] [formerly a8fb04f41c
] [formerly 803397c7c7
[formerly a8fb04f41c
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c
]
Former-commit-id: b2a0a7c148
2013-02-21 13:55:28 -06:00
Nate Jensen
b423cd4d70
Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
...
Former-commit-id: ec0dd8d234
[formerly b2f7cbcbe3
] [formerly 7dbeeb2684
] [formerly c6896b5676
[formerly 7dbeeb2684
[formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]]
Former-commit-id: c6896b5676
Former-commit-id: 97c5442369f13721659c1b0c23d03bc01ac6815a [formerly 4f4932b014
]
Former-commit-id: 533deac8d0
2013-02-21 11:47:00 -06:00
Nate Jensen
e19664ab18
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
...
Former-commit-id: a8e81097fc
[formerly 033b9e3852
] [formerly a9c4e54287
] [formerly 73f53bd513
[formerly a9c4e54287
[formerly 25ecfc3e6199294275abc8547c482388c55be724]]]
Former-commit-id: 73f53bd513
Former-commit-id: 82a8e0c1fe20524fc0676db0dbd1c0079f46a300 [formerly d7a57d2b34
]
Former-commit-id: 6f9d3f55e5
2013-02-21 11:41:52 -06:00
Ron Anderson
bcc9d63d9c
Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development
...
Former-commit-id: 1661ad92f7
[formerly e6ec21bd53
] [formerly 03c48b2f7a
] [formerly 297c132c49
[formerly 03c48b2f7a
[formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]]
Former-commit-id: 297c132c49
Former-commit-id: 53f8f259a85445c95a55275d90e6cf60b6620316 [formerly ff2370221a
]
Former-commit-id: e61af5611a
2013-02-21 09:10:07 -06:00
Matt Nash
eec2ea4c29
Issue #1506 fix for GFE evaluateRefSet() for non-queries
...
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 0531052a2e
[formerly 6f9621adb2
] [formerly 2001d916ac
] [formerly 492df9c238
[formerly 2001d916ac
[formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]]
Former-commit-id: 492df9c238
Former-commit-id: 210f7f89643e818406eeea19775de2c66f16305d [formerly 5d6a7a6140
]
Former-commit-id: 84f3da4828
2013-02-21 09:01:33 -06:00
Steve Harris
96c7269df0
13.3.1-1 baseline
...
Former-commit-id: 9bdd52a626
[formerly 96768407a5
] [formerly 0563d7ac18
] [formerly cabc8cf8b4
[formerly 0563d7ac18
[formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19
]
Former-commit-id: 0569ff413d
2013-02-21 09:36:59 -05:00
Steve Harris
6168846b97
13.2.1-8 baseline
...
Merge commit '1da0393' into master_13.3.1
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/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: f55ea02607
[formerly f5bd250026
] [formerly 7f2b4a8092
] [formerly 2f7bf90856
[formerly 7f2b4a8092
[formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]]
Former-commit-id: 2f7bf90856
Former-commit-id: 224ac801b740bcfa7e8f8edee78de977ecae225d [formerly a723531b31
]
Former-commit-id: 87bd35250c
2013-02-21 09:25:27 -05:00