Nate Jensen
7ce26fd622
Merge "Issue #2368 : Fix grib-decode.xml for future case" into omaha_13.5.1.1
...
Former-commit-id: 9e5c4ee11e
[formerly a195e02b08
] [formerly e50aa8d7d7
[formerly cc0207ec34b50ec2331e1d469153fd29a7be22ae]]
Former-commit-id: e50aa8d7d7
Former-commit-id: 35628f0569
2013-09-23 12:45:23 -05:00
Steve Harris
7e523e31e2
Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
...
Former-commit-id: 3dd67383a2
[formerly 864f4fcdb4
] [formerly 99ac915981
[formerly fa83b768dffe9a71a7990134a43f602c1b30bcfe]]
Former-commit-id: 99ac915981
Former-commit-id: 010a45e436
2013-09-23 12:12:45 -05:00
Steve Harris
c064642520
13.5.1.1-4 baseline
...
Former-commit-id: 87ffb2c668
[formerly f58a17c8b3
] [formerly f578f90a0b
[formerly 128f9c8e0e2d3706c39e259170b049a6c234be4c]]
Former-commit-id: f578f90a0b
Former-commit-id: a8f762e8d3
2013-09-23 10:29:32 -04:00
Steve Harris
d5b52526dd
13.5.1.1-3 baseline
...
Former-commit-id: a4bb855c1f
[formerly 1f4c8f317f
] [formerly 06694a32ce
[formerly 5f5672a32c95941d8a75d55dc99859f1f9585167]]
Former-commit-id: 06694a32ce
Former-commit-id: 62643f0d21
2013-09-23 10:16:44 -04:00
Richard Peter
16ca3e00aa
Issue #2368 : Fix grib-decode.xml for future case
...
Former-commit-id: 204d93eaa1
[formerly 0edd9da1bd
] [formerly 0e23b3749d
[formerly e3109abc996557301b6c91773b6841e6dc22c272]]
Former-commit-id: 0e23b3749d
Former-commit-id: ecf595edb0
2013-09-22 22:02:19 -05:00
Richard Peter
e2a2d0c7cb
Issue #2368 : Fix durable jms configurations
...
Change-Id: I0167e5f0dd5caea72c5f4220979fd9b55375b3c4
Former-commit-id: ed7a62911e
[formerly b6fd367b68
] [formerly 152d8654ef
[formerly f611b9afdf541b5fa632fe27755a69f16b871f68]]
Former-commit-id: 152d8654ef
Former-commit-id: d634b6fcc5
2013-09-18 21:20:54 -05:00
Ron Anderson
579c8323e5
Merge "Issue #2348 Fix leak of D2DGridDatabase objects." into omaha_13.5.1.1
...
Former-commit-id: e6c5b29c9d
[formerly 83574f2fff
] [formerly 9f222b38df
[formerly b0261b95da14e9d783e57fd4270c9fff646b3b82]]
Former-commit-id: 9f222b38df
Former-commit-id: 2f8a4e0078
2013-09-17 08:36:12 -05:00
Bryan Kowal
c665d4345b
Issue #2368 - restore yajsw-wrapped qpid changes to 13.5.1.1
...
Former-commit-id: d751cdf6be
[formerly 8955c3a9d4
] [formerly bb6db1ee7b
[formerly b8f277fb13562bf0c7d07700940f75074db1f93b]]
Former-commit-id: bb6db1ee7b
Former-commit-id: 45f92de475
2013-09-16 17:05:17 -05:00
Ron Anderson
163eb55f0f
Issue #2348 Fix leak of D2DGridDatabase objects.
...
Change-Id: Iaaf50d74798126335d114638b8ef2be88cf42a5d
Former-commit-id: 1c2da29a4d
[formerly 60320a0f28
] [formerly 260a9ed866
[formerly e8ffd704cfccc7cd5f4a8298a488c3ac7d8c428d]]
Former-commit-id: 260a9ed866
Former-commit-id: e779f148b4
2013-09-16 16:34:12 -05:00
Bryan Kowal
7caaa4f69e
Issue #2368 - apply java qpid patch
...
Former-commit-id: 4c2871a59b
[formerly 164598e584
] [formerly d6eca92d11
[formerly 1f29b62624650652a4a1b347dfd70fc161be0f5e]]
Former-commit-id: d6eca92d11
Former-commit-id: 170e1d40e4
2013-09-16 16:15:50 -05:00
Nate Jensen
818e604d3d
Merge "Issue #2368 : Update JMS routing to set message persistence and durability at the config level" into omaha_13.5.1.1
...
Former-commit-id: 5ce20bb2a3
[formerly 7568a0f361
] [formerly 6443fd555b
[formerly 27c515f42619fd054874c82ee8a99637f7918449]]
Former-commit-id: 6443fd555b
Former-commit-id: 8ca20735c7
2013-09-16 11:26:42 -05:00
Steve Harris
9270e14a67
Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
...
Former-commit-id: 278c91ea2d
[formerly fd83e1da11
] [formerly 2915c6393d
[formerly a419d477ab3d6d03958e1f3960eac2b428766848]]
Former-commit-id: 2915c6393d
Former-commit-id: dcc0c7e0ae
2013-09-16 09:24:25 -05:00
Steve Harris
41d7784ee6
13.5.1.1-2 baseline
...
Former-commit-id: db270db3cb
[formerly 4fa273439f
] [formerly e19db57fe6
[formerly 9638b9e92c2d271cb804d32daba114c063aeb7f5]]
Former-commit-id: e19db57fe6
Former-commit-id: 11369e2753
2013-09-16 10:02:04 -04:00
Richard Peter
db69f5b54a
Issue #2368 : Update JMS routing to set message persistence and durability at the config level
...
Former-commit-id: b803359eb4
[formerly 5111debc92
] [formerly a5a7816b98
[formerly 9ac3d2ddbeee7265b9b7879fcc6efcee95281872]]
Former-commit-id: a5a7816b98
Former-commit-id: bc169f0a04
2013-09-15 13:44:17 -05:00
Bryan Kowal
2ed95acce0
Issue #2133 - qpid is now a wrapped java application; incremented qpid release
...
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf
Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58
Former-commit-id: 1d0e58f85d
[formerly d322c993c0
] [formerly f1cfc60a93
[formerly 0a8dd30dc1937287561d7ae8a3073137d100fe4f]]
Former-commit-id: f1cfc60a93
Former-commit-id: aae9f35b39
2013-09-13 10:03:08 -05:00
Steve Harris
ef0e6f1c6d
Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
...
Former-commit-id: 029d8287dd
[formerly d6dfaa0927
] [formerly efa925587d
[formerly 47578eef1ad5c968bcf294d75c0be54478b0378c]]
Former-commit-id: efa925587d
Former-commit-id: 2b43c67c98
2013-09-12 10:28:59 -05:00
Steve Harris
3ed8000ce1
13.5.1.1-1 baseline
...
Former-commit-id: b1fb0f9236
[formerly 5b0cd7cbcc
] [formerly d2217643ff
[formerly 6ccc6d533c57302d87b49920a236f9f033c90c14]]
Former-commit-id: d2217643ff
Former-commit-id: 54e7186749
2013-09-12 11:03:55 -04:00
Ben Steffensmeier
dd45cfedfc
Issue #2341 relocate the warngen button.
...
Former-commit-id: 2d4d5653b0
[formerly 8a97c28ac5
] [formerly e5b2090392
[formerly 2ef5dd1edf9590eebd6bd18dba53f4d1fd548b72]]
Former-commit-id: e5b2090392
Former-commit-id: 1cad9c76a6
2013-09-09 14:13:20 -05:00
Ron Anderson
86bf3eeca8
Issue #2329 Cleaned up combinations file saving
...
Change-Id: I61eea505c36e10239dbb3147bfcc46e513504550
Former-commit-id: 7dad82b511
[formerly 68f868117f
] [formerly d069127c28
[formerly aeda31d9b935af3ae0acadc73016f4c22eb8bbd0]]
Former-commit-id: d069127c28
Former-commit-id: 85c5827504
2013-09-09 14:13:08 -05:00
Steve Harris
0278f189a9
13.5.1-20 baseline
...
Former-commit-id: fb4173d5dd
[formerly a60b097050
] [formerly 5f2a2434a6
[formerly 6ae21523e354f26dbf0a668239b75e9b679bbf1f]]
Former-commit-id: 5f2a2434a6
Former-commit-id: b99b6cf244
2013-09-03 09:58:18 -04:00
Steve Harris
edad929d6a
13.5.1-19 baseline
...
Former-commit-id: d50a0f64c9
[formerly 5b643065e9
] [formerly 3b296a33b0
[formerly f3acac4ea9a285e64104a55db5b76593147c15e4]]
Former-commit-id: 3b296a33b0
Former-commit-id: 3e27b2be1d
2013-09-03 09:48:08 -04:00
Steve Harris
261b1da9d6
13.5.1-18 baseline
...
Former-commit-id: d931b80e70
[formerly afb34814dd
] [formerly 0a7acf96c7
[formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]
Former-commit-id: 0a7acf96c7
Former-commit-id: 2f9aa87a9f
2013-08-22 09:12:43 -04:00
Steve Harris
7c0cf13ea8
13.5.1-17 baseline
...
Former-commit-id: 2d882ccb54
[formerly 9dd7dc5d20
] [formerly b210c90245
[formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]
Former-commit-id: b210c90245
Former-commit-id: a192a3ebb1
2013-08-19 16:34:24 -04:00
Steve Harris
e881ff6271
13.5.1-16 baseline
...
Former-commit-id: 6818d80085
[formerly cd3b63d961
] [formerly 7ce0234d76
[formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]
Former-commit-id: 7ce0234d76
Former-commit-id: d7b1ed4900
2013-08-15 13:40:37 -04:00
Steve Harris
4f9288e7c1
13.5.1-15 baseline
...
Former-commit-id: 535218c676
[formerly 53e96e21db
] [formerly c6dc1817e7
[formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]
Former-commit-id: c6dc1817e7
Former-commit-id: 65beefde58
2013-08-14 10:24:26 -04:00
Steve Harris
9bd983e2fe
13.5.1-14 baseline
...
Former-commit-id: b848317203
[formerly d695e5debe
] [formerly 80e5f7fbd4
[formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: cd5b1e9e2f
2013-08-14 10:07:41 -04:00
Greg Armendariz
9f2f62427b
13.5.1-13 baseline
...
Former-commit-id: f0b62a22bf
[formerly 29b823fee4
] [formerly 5577e686c1
[formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 5577e686c1
Former-commit-id: 8bfac41add
2013-08-08 17:00:36 -04:00
Greg Armendariz
f777a744e5
13.5.1-12 baseline
...
Former-commit-id: 01d067cff9
[formerly c9898ba8d1
] [formerly fe51885ba7
[formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]
Former-commit-id: fe51885ba7
Former-commit-id: 9892a1a262
2013-08-08 15:34:01 -04:00
Greg Armendariz
75f9f8df3f
13.5.1-11 baseline
...
Former-commit-id: c402dbf6e9
[formerly ea7b22500e
] [formerly 4ec04083bd
[formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]
Former-commit-id: 4ec04083bd
Former-commit-id: 26e58d8cdb
2013-08-07 14:34:27 -04:00
Greg Armendariz
9ddb32967c
13.5.1-10 baseline
...
Former-commit-id: e276b0fabe
[formerly 852455843f
] [formerly acf7ced37b
[formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]
Former-commit-id: acf7ced37b
Former-commit-id: 05282eac88
2013-08-07 14:14:46 -04:00
Steve Harris
c7e7c838aa
13.5.1-9 baseline
...
Former-commit-id: 778df21de9
[formerly 97fe6a670f
] [formerly 6e60cd9a79
[formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]
Former-commit-id: 6e60cd9a79
Former-commit-id: bbb7f1dd49
2013-08-01 09:20:23 -04:00
Steve Harris
a7d4c6274e
13.5.1-8 baseline
...
Former-commit-id: 392faf86e7
[formerly 3bece5e5d0
] [formerly dfbf9a5afe
[formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 2afb46f814
2013-07-26 09:02:34 -04:00
Steve Harris
cb50a0028d
13.5.1-7 baseline
...
Former-commit-id: 630705aa3f
[formerly bf58a81b38
] [formerly 86ce1248c2
[formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: 86ce1248c2
Former-commit-id: f9c9aecba5
2013-07-18 12:07:22 -04:00
Greg Armendariz
93b71934c0
13.5.1-6 baseline
...
Former-commit-id: 5894853996
[formerly 7e09fa5a0b
] [formerly b9044b1195
[formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]
Former-commit-id: b9044b1195
Former-commit-id: 12a09f9aa7
2013-07-10 10:04:22 -04:00
Greg Armendariz
d899faec3d
13.5.1-5 baseline
...
Former-commit-id: 82aabf1066
[formerly 492f92ef7b
] [formerly ea7ac37930
[formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: ea7ac37930
Former-commit-id: 869922cb82
2013-07-03 12:20:27 -04:00
Steve Harris
640b022e84
13.5.1-4 baseline
...
Former-commit-id: c56be8a332
[formerly 70e4ff30a6
] [formerly e197f23ce3
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
2013-06-28 09:46:25 -04:00
Steve Harris
deebdb874a
13.5.1-3 baseline
...
Former-commit-id: d8176d4a4c
[formerly 63803c1424
] [formerly 72d22a30c9
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 72d22a30c9
Former-commit-id: 810388f00a
2013-06-24 09:29:43 -04:00
Steve Harris
ccd66c0724
13.5.1-2 baseline
...
Former-commit-id: bc60b22f00
[formerly adb779323d
] [formerly 3386330894
[formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
2013-06-17 15:01:22 -04:00
Steve Harris
0aab285b8a
13.5.1-1 baseline
...
Former-commit-id: 6384018950
[formerly 998961612c
] [formerly fe872355a7
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
2013-06-10 15:17:17 -04:00
Steve Harris
69e1b32d11
Merge branch 'master_13.4.1' into master_13.5.1
...
Conflicts (solved by taking all of 13.4.1-14):
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
rpms/awips2.core/Installer.ldm/component.spec
rpms/build/i386/build.sh
Former-commit-id: bb6628c17f
[formerly b0e5c758dc
] [formerly 2fc7f80939
[formerly 388fb201c6914d9ec7986a1017df57e5e2de0633]]
Former-commit-id: 2fc7f80939
Former-commit-id: eef1151c17
2013-06-10 15:07:59 -04:00
Steve Harris
cebc1ddb63
13.4.1-14 baseline
...
Former-commit-id: be236eb722
[formerly c749e122eb
] [formerly 18b90226a2
[formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: 18b90226a2
Former-commit-id: dee685e3c7
2013-06-06 15:15:27 -04:00
Steve Harris
418f8aef56
13.4.1-13 baseline
...
Former-commit-id: e3b8086bd0
[formerly 87b9712009
] [formerly de476791fb
[formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]
Former-commit-id: de476791fb
Former-commit-id: b58cf237bf
2013-05-29 16:30:09 -04:00
Steve Harris
b745b332ae
13.4.1-12 baseline
...
Former-commit-id: 397bbf674a
[formerly 6a97b4325a
] [formerly e53ada66b8
[formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: e53ada66b8
Former-commit-id: bd4f93e859
2013-05-22 16:42:39 -04:00
Steve Harris
4d88863515
13.4.1-11 baseline
...
Former-commit-id: d6319a2ca6
[formerly 2edee36158
] [formerly c0376ce9ed
[formerly e414ae01ab52b3940647e46e22bba3b89790c142]]
Former-commit-id: c0376ce9ed
Former-commit-id: 6df093ef48
2013-05-21 09:19:25 -04:00
Steve Harris
7e04d8cd13
13.4.1-10 baseline
...
Former-commit-id: 68fe2134b8
[formerly 9a403b3615
] [formerly 92152778b9
[formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 92152778b9
Former-commit-id: b1fc4e625b
2013-05-20 10:52:47 -04:00
Steve Harris
67a95d07d2
13.4.1-9 baseline
...
Former-commit-id: 88eee9cbfa
[formerly bcf7f15c90
] [formerly aff41713f9
[formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: aff41713f9
Former-commit-id: 0766ae20dd
2013-05-16 11:12:07 -04:00
Steve Harris
5465764527
13.4.1-8 baseline
...
Former-commit-id: 576a74fe0b
[formerly 19866e7032
] [formerly c59b52a266
[formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: c59b52a266
Former-commit-id: a1c4cd2a39
2013-05-14 09:21:41 -04:00
Steve Harris
ff7a21ac37
13.4.1-7 baseline
...
Former-commit-id: 8072752c77
[formerly 4c6ff79e71
] [formerly 8347bed50e
[formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 8347bed50e
Former-commit-id: b35027f661
2013-05-13 12:58:10 -04:00
Steve Harris
5be793f2f9
13.4.1-6 baseline
...
Former-commit-id: 6fcbb5ae6b
[formerly 8379977673
] [formerly 16fe8cc5a2
[formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]
Former-commit-id: 16fe8cc5a2
Former-commit-id: 979700c302
2013-05-07 08:47:39 -04:00
Steve Harris
e0af96524f
13.4.1-5 baseline
...
Former-commit-id: aa9a719836
[formerly 85bbf6d242
] [formerly 4ae0e2e858
[formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]
Former-commit-id: 4ae0e2e858
Former-commit-id: aa4624c58f
2013-05-03 09:29:14 -05:00