Bryan Kowal
e5fbcc1a09
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: 1ff8ab2db2
[formerly 1d0e58f85d
] [formerly d322c993c0
] [formerly 1ff8ab2db2
[formerly 1d0e58f85d
] [formerly d322c993c0
] [formerly f1cfc60a93
[formerly d322c993c0
[formerly 0a8dd30dc1937287561d7ae8a3073137d100fe4f]]]]
Former-commit-id: f1cfc60a93
Former-commit-id: 2e921da8c0
[formerly 2ed95acce0
] [formerly 0c09d4dd62d00cd7ab7654c3ae16063225321219 [formerly aae9f35b39
]]
Former-commit-id: 2b3058af237ed12c5aa1650ace786259842b5e19 [formerly ddd1e47e38
]
Former-commit-id: ffa598d3f9
2013-09-13 10:03:08 -05:00
Steve Harris
5bd7027ca5
Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
...
Former-commit-id: 905a43b2d7
[formerly 029d8287dd
] [formerly d6dfaa0927
] [formerly 905a43b2d7
[formerly 029d8287dd
] [formerly d6dfaa0927
] [formerly efa925587d
[formerly d6dfaa0927
[formerly 47578eef1ad5c968bcf294d75c0be54478b0378c]]]]
Former-commit-id: efa925587d
Former-commit-id: 03b75339f9
[formerly ef0e6f1c6d
] [formerly 2be998745e33aa5b72bf9c64552b41da41eb00a3 [formerly 2b43c67c98
]]
Former-commit-id: 00630de94424740a9413a7bde761afc5e7fc83d1 [formerly c1e04be860
]
Former-commit-id: 865669f486
2013-09-12 10:28:59 -05:00
Steve Harris
152a9208a2
13.5.1.1-1 baseline
...
Former-commit-id: dcaa4767f3
[formerly b1fb0f9236
] [formerly 5b0cd7cbcc
] [formerly dcaa4767f3
[formerly b1fb0f9236
] [formerly 5b0cd7cbcc
] [formerly d2217643ff
[formerly 5b0cd7cbcc
[formerly 6ccc6d533c57302d87b49920a236f9f033c90c14]]]]
Former-commit-id: d2217643ff
Former-commit-id: 69b7e120f4
[formerly 3ed8000ce1
] [formerly 5d27b520bcecd57bdae31ab83acb368b1f9c3141 [formerly 54e7186749
]]
Former-commit-id: 1d87c8d3482c24629f490198056a5a760876a67f [formerly 16f4abff68
]
Former-commit-id: 115a97e9ae
2013-09-12 11:03:55 -04:00
Ben Steffensmeier
b0fb6e1efb
Issue #2341 relocate the warngen button.
...
Former-commit-id: 43fdd467fc
[formerly 2d4d5653b0
] [formerly 8a97c28ac5
] [formerly 43fdd467fc
[formerly 2d4d5653b0
] [formerly 8a97c28ac5
] [formerly e5b2090392
[formerly 8a97c28ac5
[formerly 2ef5dd1edf9590eebd6bd18dba53f4d1fd548b72]]]]
Former-commit-id: e5b2090392
Former-commit-id: 1c3e74c762
[formerly dd45cfedfc
] [formerly 832a85993c7a070a0e9a72106b4bda8ab96a0c01 [formerly 1cad9c76a6
]]
Former-commit-id: e06c7de475fa9973fa5dc4c1a557fb49114c3e52 [formerly 685cfc3080
]
Former-commit-id: a974f41165
2013-09-09 14:13:20 -05:00
Ron Anderson
a8b34aaf40
Issue #2329 Cleaned up combinations file saving
...
Change-Id: I61eea505c36e10239dbb3147bfcc46e513504550
Former-commit-id: aff50967f0
[formerly 7dad82b511
] [formerly 68f868117f
] [formerly aff50967f0
[formerly 7dad82b511
] [formerly 68f868117f
] [formerly d069127c28
[formerly 68f868117f
[formerly aeda31d9b935af3ae0acadc73016f4c22eb8bbd0]]]]
Former-commit-id: d069127c28
Former-commit-id: c2a33a9585
[formerly 86bf3eeca8
] [formerly 6f1186c38aec1d3e5b47eb5ed294059389011ecd [formerly 85c5827504
]]
Former-commit-id: ade23be39fcd3d20c590752441b61f66d9ca3952 [formerly a4b214e968
]
Former-commit-id: d843a1e2b1
2013-09-09 14:13:08 -05:00
Steve Harris
199bee9437
13.5.1-20 baseline
...
Former-commit-id: bbd58fce53
[formerly fb4173d5dd
] [formerly a60b097050
] [formerly bbd58fce53
[formerly fb4173d5dd
] [formerly a60b097050
] [formerly 5f2a2434a6
[formerly a60b097050
[formerly 6ae21523e354f26dbf0a668239b75e9b679bbf1f]]]]
Former-commit-id: 5f2a2434a6
Former-commit-id: e7f1079d23
[formerly 0278f189a9
] [formerly e9404c23774ef105a8b0951164d0c19a69b16c4d [formerly b99b6cf244
]]
Former-commit-id: 821985879690713c438c2f234ab9c69e5a9fa293 [formerly 5373999a27
]
Former-commit-id: b11a402718
2013-09-03 09:58:18 -04:00
Steve Harris
ed5b3c910e
13.5.1-19 baseline
...
Former-commit-id: 12f85e6c92
[formerly d50a0f64c9
] [formerly 5b643065e9
] [formerly 12f85e6c92
[formerly d50a0f64c9
] [formerly 5b643065e9
] [formerly 3b296a33b0
[formerly 5b643065e9
[formerly f3acac4ea9a285e64104a55db5b76593147c15e4]]]]
Former-commit-id: 3b296a33b0
Former-commit-id: bdaa93824d
[formerly edad929d6a
] [formerly 75009c0b37042f112b88cfc51b0c3d9555c67908 [formerly 3e27b2be1d
]]
Former-commit-id: 7afcd2aafb5c6c07e90ce0f7253ed22c7c16831e [formerly 9e85745f8a
]
Former-commit-id: 225c411e48
2013-09-03 09:48:08 -04:00
Steve Harris
690e24905c
13.5.1-18 baseline
...
Former-commit-id: 80d8236464
[formerly d931b80e70
] [formerly afb34814dd
] [formerly 80d8236464
[formerly d931b80e70
] [formerly afb34814dd
] [formerly 0a7acf96c7
[formerly afb34814dd
[formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: ff31991527
[formerly 261b1da9d6
] [formerly bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f
]]
Former-commit-id: 9f45e3bbb3ed565bf3eab964a0ff4d2313fd7eda [formerly cde7f2a59c
]
Former-commit-id: 6c258a0b7c
2013-08-22 09:12:43 -04:00
Steve Harris
7a291e0bfb
13.5.1-17 baseline
...
Former-commit-id: fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly b210c90245
[formerly 9dd7dc5d20
[formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]]
Former-commit-id: b210c90245
Former-commit-id: 4fd4093539
[formerly 7c0cf13ea8
] [formerly c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1
]]
Former-commit-id: 27a8a42f514b9659d14772e48ae0d9cff9703709 [formerly 815bfe575c
]
Former-commit-id: 4bcb06cd63
2013-08-19 16:34:24 -04:00
Steve Harris
ca5109f3d6
13.5.1-16 baseline
...
Former-commit-id: 47130c98a5
[formerly 6818d80085
] [formerly cd3b63d961
] [formerly 47130c98a5
[formerly 6818d80085
] [formerly cd3b63d961
] [formerly 7ce0234d76
[formerly cd3b63d961
[formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]]
Former-commit-id: 7ce0234d76
Former-commit-id: ca5796e082
[formerly e881ff6271
] [formerly 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900
]]
Former-commit-id: 8ac6ca8ce4a5022058bcf2cfc30b1481b8e7c987 [formerly af2b4495bb
]
Former-commit-id: ff03caef3d
2013-08-15 13:40:37 -04:00
Steve Harris
a700182250
13.5.1-15 baseline
...
Former-commit-id: b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly c6dc1817e7
[formerly 53e96e21db
[formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 6f1b6d494f
[formerly 4f9288e7c1
] [formerly c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58
]]
Former-commit-id: 813df6d93357ffbcdd78c9658dc75c9aaa803d60 [formerly 9ea3f0c215
]
Former-commit-id: d0be6956e9
2013-08-14 10:24:26 -04:00
Steve Harris
a338706fa4
13.5.1-14 baseline
...
Former-commit-id: c6465a3398
[formerly b848317203
] [formerly d695e5debe
] [formerly c6465a3398
[formerly b848317203
] [formerly d695e5debe
] [formerly 80e5f7fbd4
[formerly d695e5debe
[formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 4e75333155
[formerly 9bd983e2fe
] [formerly 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f
]]
Former-commit-id: d8f0e84b19aec7b3ded8283169da1f9631e8d68a [formerly 0f3ffc3892
]
Former-commit-id: f4262380d6
2013-08-14 10:07:41 -04:00
Greg Armendariz
b264a9d841
13.5.1-13 baseline
...
Former-commit-id: 429898edc6
[formerly f0b62a22bf
] [formerly 29b823fee4
] [formerly 429898edc6
[formerly f0b62a22bf
] [formerly 29b823fee4
] [formerly 5577e686c1
[formerly 29b823fee4
[formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac
[formerly 9f2f62427b
] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add
]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5
]
Former-commit-id: 0c61b62d24
2013-08-08 17:00:36 -04:00
Greg Armendariz
d37c94464b
13.5.1-12 baseline
...
Former-commit-id: 34e0218b59
[formerly 01d067cff9
] [formerly c9898ba8d1
] [formerly 34e0218b59
[formerly 01d067cff9
] [formerly c9898ba8d1
] [formerly fe51885ba7
[formerly c9898ba8d1
[formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]]
Former-commit-id: fe51885ba7
Former-commit-id: 75d1e77f1b
[formerly f777a744e5
] [formerly cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262
]]
Former-commit-id: c31f8384962ae36ae9a33ef84d46aea958522032 [formerly cbf9e42c21
]
Former-commit-id: 244bc3ac37
2013-08-08 15:34:01 -04:00
Greg Armendariz
7fb928e967
13.5.1-11 baseline
...
Former-commit-id: 814f7fdcdd
[formerly c402dbf6e9
] [formerly ea7b22500e
] [formerly 814f7fdcdd
[formerly c402dbf6e9
] [formerly ea7b22500e
] [formerly 4ec04083bd
[formerly ea7b22500e
[formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 4c20fc4977
[formerly 75f9f8df3f
] [formerly f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb
]]
Former-commit-id: 4b97c9297a6132e1a64e7b28e4204a8cd32cdd79 [formerly f06ee47260
]
Former-commit-id: 8bf2c1cc07
2013-08-07 14:34:27 -04:00
Greg Armendariz
0bb16ced54
13.5.1-10 baseline
...
Former-commit-id: 9694f9390a
[formerly e276b0fabe
] [formerly 852455843f
] [formerly 9694f9390a
[formerly e276b0fabe
] [formerly 852455843f
] [formerly acf7ced37b
[formerly 852455843f
[formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]]
Former-commit-id: acf7ced37b
Former-commit-id: 690ea2e228
[formerly 9ddb32967c
] [formerly 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88
]]
Former-commit-id: f92c8134fca60f550bc93797091c6154015f9683 [formerly f37ef8c24e
]
Former-commit-id: 5998f47f57
2013-08-07 14:14:46 -04:00
Steve Harris
a7c6d3b46d
13.5.1-9 baseline
...
Former-commit-id: 1be9abc02f
[formerly 778df21de9
] [formerly 97fe6a670f
] [formerly 1be9abc02f
[formerly 778df21de9
] [formerly 97fe6a670f
] [formerly 6e60cd9a79
[formerly 97fe6a670f
[formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 7fc384a659
[formerly c7e7c838aa
] [formerly 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49
]]
Former-commit-id: dd4d7bf31c8224a969995ed35d8e37b50bb8a6d6 [formerly e16fce85ae
]
Former-commit-id: ef41819406
2013-08-01 09:20:23 -04:00
Steve Harris
dded20dc93
13.5.1-8 baseline
...
Former-commit-id: 52da6c54db
[formerly 392faf86e7
] [formerly 3bece5e5d0
] [formerly 52da6c54db
[formerly 392faf86e7
] [formerly 3bece5e5d0
] [formerly dfbf9a5afe
[formerly 3bece5e5d0
[formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60
[formerly a7d4c6274e
] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814
]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf
]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
Steve Harris
adf2f89d57
13.5.1-7 baseline
...
Former-commit-id: 67299457b1
[formerly 630705aa3f
] [formerly bf58a81b38
] [formerly 67299457b1
[formerly 630705aa3f
] [formerly bf58a81b38
] [formerly 86ce1248c2
[formerly bf58a81b38
[formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b
[formerly cb50a0028d
] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5
]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd
]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Greg Armendariz
df73c0e2e9
13.5.1-6 baseline
...
Former-commit-id: e375a74bc8
[formerly 5894853996
] [formerly 7e09fa5a0b
] [formerly e375a74bc8
[formerly 5894853996
] [formerly 7e09fa5a0b
] [formerly b9044b1195
[formerly 7e09fa5a0b
[formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977
[formerly 93b71934c0
] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7
]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d
]
Former-commit-id: b601345c9f
2013-07-10 10:04:22 -04:00
Greg Armendariz
5e1549062b
13.5.1-5 baseline
...
Former-commit-id: ed9da994c7
[formerly 82aabf1066
] [formerly 492f92ef7b
] [formerly ed9da994c7
[formerly 82aabf1066
] [formerly 492f92ef7b
] [formerly ea7ac37930
[formerly 492f92ef7b
[formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: d5bea0fc06
[formerly d899faec3d
] [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82
]]
Former-commit-id: 22058c6a24f6da687ba40d05b28790e525082567 [formerly dc881f4ed8
]
Former-commit-id: 13ac0b1062
2013-07-03 12:20:27 -04:00
Steve Harris
9f5469bc6e
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly e197f23ce3
[formerly 70e4ff30a6
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901
[formerly 640b022e84
] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357
]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922
]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Steve Harris
d3517d7c1d
13.5.1-3 baseline
...
Former-commit-id: a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly 72d22a30c9
[formerly 63803c1424
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0
[formerly deebdb874a
] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a
]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5
]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Steve Harris
4d75e573f4
13.5.1-2 baseline
...
Former-commit-id: 7fe15db2f8
[formerly bc60b22f00
] [formerly adb779323d
] [formerly 7fe15db2f8
[formerly bc60b22f00
] [formerly adb779323d
] [formerly 3386330894
[formerly adb779323d
[formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab
[formerly ccd66c0724
] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7
]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de
]
Former-commit-id: afc02d5731
2013-06-17 15:01:22 -04:00
Steve Harris
97a4c59662
13.5.1-1 baseline
...
Former-commit-id: 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly fe872355a7
[formerly 998961612c
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410
[formerly 0aab285b8a
] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e
]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940
]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
1b4abec7c3
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: cdb89b5d29
[formerly bb6628c17f
] [formerly b0e5c758dc
] [formerly cdb89b5d29
[formerly bb6628c17f
] [formerly b0e5c758dc
] [formerly 2fc7f80939
[formerly b0e5c758dc
[formerly 388fb201c6914d9ec7986a1017df57e5e2de0633]]]]
Former-commit-id: 2fc7f80939
Former-commit-id: 7a0905578d
[formerly 69e1b32d11
] [formerly 07dd7cfbce515d465564bc054b81cf7330f90242 [formerly eef1151c17
]]
Former-commit-id: 8d2e2e583b71ac3baf0d87250608b2615c8384b3 [formerly 954e142d91
]
Former-commit-id: e9904efd7f
2013-06-10 15:07:59 -04:00
Steve Harris
c57686831a
13.4.1-14 baseline
...
Former-commit-id: ffcce90f3f
[formerly be236eb722
] [formerly c749e122eb
] [formerly ffcce90f3f
[formerly be236eb722
] [formerly c749e122eb
] [formerly 18b90226a2
[formerly c749e122eb
[formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]]
Former-commit-id: 18b90226a2
Former-commit-id: f7316ae4bd
[formerly cebc1ddb63
] [formerly a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7
]]
Former-commit-id: 1e747c10c7b7049ff47d3fe068c65055d7ab4a0e [formerly 8ec7524cbb
]
Former-commit-id: d46b0413fb
2013-06-06 15:15:27 -04:00
Steve Harris
7e31d1a9a1
13.4.1-13 baseline
...
Former-commit-id: 9a7ef48967
[formerly e3b8086bd0
] [formerly 87b9712009
] [formerly 9a7ef48967
[formerly e3b8086bd0
] [formerly 87b9712009
] [formerly de476791fb
[formerly 87b9712009
[formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]]
Former-commit-id: de476791fb
Former-commit-id: 70ecafa237
[formerly 418f8aef56
] [formerly 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf
]]
Former-commit-id: 28cd3469f8ef78216f243c61430c36c1ad67dd52 [formerly c9155c1631
]
Former-commit-id: 176f4d392f
2013-05-29 16:30:09 -04:00
Steve Harris
cf67535a3a
13.4.1-12 baseline
...
Former-commit-id: 623f813923
[formerly 397bbf674a
] [formerly 6a97b4325a
] [formerly 623f813923
[formerly 397bbf674a
] [formerly 6a97b4325a
] [formerly e53ada66b8
[formerly 6a97b4325a
[formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: fb41995981
[formerly b745b332ae
] [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859
]]
Former-commit-id: 0563320c3a39f9ddb056e9b1876ed4108f818501 [formerly 0d9e71aee2
]
Former-commit-id: 71e13c4d4d
2013-05-22 16:42:39 -04:00
Steve Harris
603bc2535a
13.4.1-11 baseline
...
Former-commit-id: 65d8f51034
[formerly d6319a2ca6
] [formerly 2edee36158
] [formerly 65d8f51034
[formerly d6319a2ca6
] [formerly 2edee36158
] [formerly c0376ce9ed
[formerly 2edee36158
[formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 5db95cce55
[formerly 4d88863515
] [formerly d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48
]]
Former-commit-id: b076884dd48bff50b64587e186d178820fa5b5cf [formerly 2767fd893c
]
Former-commit-id: d9f967c811
2013-05-21 09:19:25 -04:00
Steve Harris
0b9bf76434
13.4.1-10 baseline
...
Former-commit-id: 294c127b0a
[formerly 68fe2134b8
] [formerly 9a403b3615
] [formerly 294c127b0a
[formerly 68fe2134b8
] [formerly 9a403b3615
] [formerly 92152778b9
[formerly 9a403b3615
[formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]]
Former-commit-id: 92152778b9
Former-commit-id: ac83fff244
[formerly 7e04d8cd13
] [formerly 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b
]]
Former-commit-id: 3963e7aafef444157e59ab93198e8eb33ab5acb5 [formerly 322036ea82
]
Former-commit-id: b41118326c
2013-05-20 10:52:47 -04:00
Steve Harris
202e373f01
13.4.1-9 baseline
...
Former-commit-id: 301821988e
[formerly 88eee9cbfa
] [formerly bcf7f15c90
] [formerly 301821988e
[formerly 88eee9cbfa
] [formerly bcf7f15c90
] [formerly aff41713f9
[formerly bcf7f15c90
[formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]]
Former-commit-id: aff41713f9
Former-commit-id: 7d55d0e959
[formerly 67a95d07d2
] [formerly b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd
]]
Former-commit-id: a7c4bec32a032d07ef14566103e744b20ea31401 [formerly 3f87ea1a15
]
Former-commit-id: 1730b6c41e
2013-05-16 11:12:07 -04:00
Steve Harris
4b1a9ad438
13.4.1-8 baseline
...
Former-commit-id: 02dba50c00
[formerly 576a74fe0b
] [formerly 19866e7032
] [formerly 02dba50c00
[formerly 576a74fe0b
] [formerly 19866e7032
] [formerly c59b52a266
[formerly 19866e7032
[formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]]
Former-commit-id: c59b52a266
Former-commit-id: fddef92bf3
[formerly 5465764527
] [formerly c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39
]]
Former-commit-id: 39606e2ce74e5380d44e132dd22716b3b06b5051 [formerly 395d21565f
]
Former-commit-id: 5bdcf5c0a1
2013-05-14 09:21:41 -04:00
Steve Harris
a2c35a5f3f
13.4.1-7 baseline
...
Former-commit-id: 81bc07bff4
[formerly 8072752c77
] [formerly 4c6ff79e71
] [formerly 81bc07bff4
[formerly 8072752c77
] [formerly 4c6ff79e71
] [formerly 8347bed50e
[formerly 4c6ff79e71
[formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f
[formerly ff7a21ac37
] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661
]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc
]
Former-commit-id: c7c6ea343e
2013-05-13 12:58:10 -04:00
Steve Harris
f04a1e8fc0
13.4.1-6 baseline
...
Former-commit-id: 5544c4a072
[formerly 6fcbb5ae6b
] [formerly 8379977673
] [formerly 5544c4a072
[formerly 6fcbb5ae6b
] [formerly 8379977673
] [formerly 16fe8cc5a2
[formerly 8379977673
[formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]]]
Former-commit-id: 16fe8cc5a2
Former-commit-id: 5568ada76b
[formerly 5be793f2f9
] [formerly f649c7ad7b4bf50f9a110308d2253393bb3d2506 [formerly 979700c302
]]
Former-commit-id: 772ececc049088d7fcf3524449b57d47ac45e322 [formerly 2e835dc591
]
Former-commit-id: 5e54a425fb
2013-05-07 08:47:39 -04:00
Steve Harris
ab612b6c0f
13.4.1-5 baseline
...
Former-commit-id: 313481c30e
[formerly aa9a719836
] [formerly 85bbf6d242
] [formerly 313481c30e
[formerly aa9a719836
] [formerly 85bbf6d242
] [formerly 4ae0e2e858
[formerly 85bbf6d242
[formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]]]
Former-commit-id: 4ae0e2e858
Former-commit-id: 450dbb7e8d
[formerly e0af96524f
] [formerly 2eb97f64bb7ce7cc6616c74badc76ecc130a4aee [formerly aa4624c58f
]]
Former-commit-id: e4922fa3c05c1291bbfa71f38018a0dbf70e2b58 [formerly 53daaea355
]
Former-commit-id: 210f5ee219
2013-05-03 09:29:14 -05:00
Steve Harris
4647d70fd8
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
...
Former-commit-id: 29777b406e
[formerly 344054d3e9
] [formerly 1a6fd7edfd
] [formerly 29777b406e
[formerly 344054d3e9
] [formerly 1a6fd7edfd
] [formerly 0f76c3cbee
[formerly 1a6fd7edfd
[formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]]]
Former-commit-id: 0f76c3cbee
Former-commit-id: f83b6daf56
[formerly c1349f4a6d
] [formerly 40a0e843311ddd470a12258a3bc95ce73d614c01 [formerly 99a7521fd6
]]
Former-commit-id: aa7844c83d5bb0a0e9bf3d45f714ce4f67810c47 [formerly 764924cd1e
]
Former-commit-id: e1a369a499
2013-05-03 09:20:30 -05:00
Steve Harris
ba48ab0362
13.4.1-4 baseline
...
Former-commit-id: ef5893b279
[formerly 99f4569650
] [formerly d33e5861aa
] [formerly ef5893b279
[formerly 99f4569650
] [formerly d33e5861aa
] [formerly 7a78f8ac6e
[formerly d33e5861aa
[formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7d085660f8
[formerly 4357e2dacc
] [formerly 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32
]]
Former-commit-id: 6fc143d13d42b0d419bcede3614f0ee982260764 [formerly e0986cfda8
]
Former-commit-id: 5dbfeb38ac
2013-05-02 10:00:38 -05:00
Steve Harris
7193eee657
13.4.1-3 baseline
...
Former-commit-id: 03ff5cd82c
[formerly 3486902772
] [formerly 54afedf617
] [formerly 03ff5cd82c
[formerly 3486902772
] [formerly 54afedf617
] [formerly 86e96f378c
[formerly 54afedf617
[formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]]]]
Former-commit-id: 86e96f378c
Former-commit-id: 63a820bca5
[formerly 9fb6f3835c
] [formerly 9ed4bd11d8f4f59100814b197a573e16fc302211 [formerly 8a41dd2048
]]
Former-commit-id: efce989e4749e088495f2c8e2c2e6ff2660cbac9 [formerly 7e923539d5
]
Former-commit-id: d8da1e82f5
2013-04-29 12:25:07 -05:00
Steve Harris
dc6ffe2ccf
13.4.1-2 baseline
...
Former-commit-id: 4533276dd5
[formerly 9212be8b74
] [formerly 52f0ae4758
] [formerly 4533276dd5
[formerly 9212be8b74
] [formerly 52f0ae4758
] [formerly 5ebd58a0b3
[formerly 52f0ae4758
[formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]]]]
Former-commit-id: 5ebd58a0b3
Former-commit-id: 9f9d623cb7
[formerly 6880107d32
] [formerly 742c1aa68303bc46ceb9dc5329e59d055f9196d4 [formerly 99bc8c8072
]]
Former-commit-id: 98121cb0481fa56429e9421ab7d17667e0bd863c [formerly c0481dcdf2
]
Former-commit-id: b2b9dac313
2013-04-24 17:22:10 -05:00
Steve Harris
b0fb1f49be
13.4.1-1 baseline
...
Former-commit-id: 79567aac51
[formerly f95e0ad10b
] [formerly 2f517b7713
] [formerly 79567aac51
[formerly f95e0ad10b
] [formerly 2f517b7713
] [formerly 00332e6305
[formerly 2f517b7713
[formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]]
Former-commit-id: 00332e6305
Former-commit-id: aecc3cfd89
[formerly 0e950655f1
] [formerly fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db
]]
Former-commit-id: 85465ead73fe31102e486ee012a5fcb51cfcc9b9 [formerly 4001e050e7
]
Former-commit-id: 722e428c74
2013-04-24 17:15:55 -05:00
Steve Harris
aded012c47
Merge branch 'master_13.3.1' into master_13.4.1
...
Former-commit-id: 9d57ad1675
[formerly 035878a846
] [formerly 7957c52dec
] [formerly 9d57ad1675
[formerly 035878a846
] [formerly 7957c52dec
] [formerly e6d37f3e6d
[formerly 7957c52dec
[formerly 59bd064351a843fd514514de9dc942d13c6d7793]]]]
Former-commit-id: e6d37f3e6d
Former-commit-id: f5ccd224d4
[formerly e11088fefd
] [formerly 0cf541c2cb1fdf3ce52a0d77346996fa9e50b39b [formerly ad51361408
]]
Former-commit-id: 715a0385d4823349042ed884044c65dde8a975bf [formerly 01dfc19f60
]
Former-commit-id: 7dbffd78a1
2013-04-15 09:34:45 -05:00
Steve Harris
99d89adc2e
13.3.1-20 baseline
...
Former-commit-id: 9e73c3f1ed
[formerly 07f7e6e2b4
] [formerly 25432cc388
] [formerly 9e73c3f1ed
[formerly 07f7e6e2b4
] [formerly 25432cc388
] [formerly 446bec6f49
[formerly 25432cc388
[formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]]]
Former-commit-id: 446bec6f49
Former-commit-id: 1749ff8a3c
[formerly 8535bceb4c
] [formerly 48c43f807cd6cab814e5d057a67effdc5c9ea638 [formerly 4b71131386
]]
Former-commit-id: 03e22585dd1936fc2af32023a5ae3b65d4f222f9 [formerly 44cd8d47fb
]
Former-commit-id: 953ffdab87
2013-04-15 08:58:59 -05:00
Steve Harris
b6db7821fa
13.3.1-19 baseline
...
Former-commit-id: 196767d525
[formerly dc9fef33a9
] [formerly 9be238bcc4
] [formerly 196767d525
[formerly dc9fef33a9
] [formerly 9be238bcc4
] [formerly abaf9f12f9
[formerly 9be238bcc4
[formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]]
Former-commit-id: abaf9f12f9
Former-commit-id: fe5020d315
[formerly ed4150db5f
] [formerly afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23
]]
Former-commit-id: 8178539bb83f1e27afa01a5dd82705a3f18fc420 [formerly 7d76371536
]
Former-commit-id: 7b7efd0bd1
2013-04-09 08:37:12 -05:00
Steve Harris
370fe32515
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
...
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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/WarngenUIManager.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
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: 55655fdab9
[formerly 3487a41532
] [formerly ea34b1db1e
] [formerly 55655fdab9
[formerly 3487a41532
] [formerly ea34b1db1e
] [formerly d98a119f4d
[formerly ea34b1db1e
[formerly 735ce03302b54116c8545daf043585fb16fabd11]]]]
Former-commit-id: d98a119f4d
Former-commit-id: 1a2b88cd38
[formerly 3ea89862c0
] [formerly 81f4469f3483d2aa0d3f210a9122ae238b69e5a7 [formerly 1a91fd82ff
]]
Former-commit-id: ce9119cdd89f24a126f2689d183e0b09c5572365 [formerly f0918ec8ad
]
Former-commit-id: e0eda90af4
2013-04-04 11:12:22 -05:00
Steve Harris
381a4002f3
Merge AWIPS2 master branch (13.2.1-21) into master
...
Former-commit-id: 0187ed0d28
[formerly bf8a149596
] [formerly 0676aa710a
] [formerly 0187ed0d28
[formerly bf8a149596
] [formerly 0676aa710a
] [formerly 19bb737425
[formerly 0676aa710a
[formerly a5433b05559621bce842ce98f68f9fd151109531]]]]
Former-commit-id: 19bb737425
Former-commit-id: 467ced2742
[formerly bf75c6aa20
] [formerly 563240b9b66c1c3fb6cbe62be623fb578421eae0 [formerly 8c5538c10c
]]
Former-commit-id: b0eeab4f21dd4806fe09851b87b05455b352ea43 [formerly b26ed3c05d
]
Former-commit-id: cb521ce569
2013-04-04 09:54:02 -05:00
Steve Harris
42e7477c93
Merge branch 'master_13.2.1' into master
...
Former-commit-id: 4f764d1bee
[formerly c946213066
] [formerly f0b9589c11
] [formerly 4f764d1bee
[formerly c946213066
] [formerly f0b9589c11
] [formerly 9df0038ea3
[formerly f0b9589c11
[formerly 9d79a4e435d69849510f51b6ed8ac13f8eda438a]]]]
Former-commit-id: 9df0038ea3
Former-commit-id: 02eaa8f9be
[formerly 18e517f361
] [formerly 869ae62b63ae4e331e1d7be46bb59b200970bb77 [formerly 10d1218035
]]
Former-commit-id: b7a58f8470e75fc224df5a47c1e202b39361386d [formerly 5de87a92b9
]
Former-commit-id: 3e3a4a7c83
2013-04-04 10:51:40 -04:00
Steve Harris
1f6b440afd
Merge AWIPS2 master branch (13.2.1-19) into master
...
All conflicts overridden by 'theirs' merge - all of AWIPS2 master
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/gui/WarngenUIState.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: fcb5db91f4
[formerly 4b2462390e
] [formerly 4861007a03
] [formerly fcb5db91f4
[formerly 4b2462390e
] [formerly 4861007a03
] [formerly dab32b0413
[formerly 4861007a03
[formerly 9cab4557a50e2bcda09365a86b54e5e5613f0a57]]]]
Former-commit-id: dab32b0413
Former-commit-id: 527c41b81e
[formerly 8a7bb1f4c8
] [formerly 56fd104754441c4f44c1479b829750c7abdf97ba [formerly 4bb5d51847
]]
Former-commit-id: 32ec482d1bfceac5d107dfad27733f16c6901fef [formerly d1962bef6b
]
Former-commit-id: c217183793
2013-04-04 08:22:05 -05:00
Steve Harris
dd878fe749
13.2.1-21 baseline
...
Former-commit-id: 50106822ea
[formerly a86d44584d
] [formerly d4358b93dc
] [formerly 50106822ea
[formerly a86d44584d
] [formerly d4358b93dc
] [formerly 33bd359cfe
[formerly d4358b93dc
[formerly f80eddbb15e5ca1710c15d245957345d6f840546]]]]
Former-commit-id: 33bd359cfe
Former-commit-id: 688327d314
[formerly 5c029bc4ac
] [formerly 09e2a7d813b8cb62d46bd89be26006f9864a8721 [formerly 18d6fa4f4d
]]
Former-commit-id: 61f40969380e40cdb0eb63774bda339712e25d4e [formerly eb5258f043
]
Former-commit-id: 3d1d0a6a9c
2013-04-03 18:08:41 -04:00
Steve Harris
54f2f2b94a
13.2.1-20 baseline
...
Former-commit-id: 3aa43b1b0d
[formerly ad663b925c
] [formerly 6a55bc5dff
] [formerly 3aa43b1b0d
[formerly ad663b925c
] [formerly 6a55bc5dff
] [formerly 539faf0a71
[formerly 6a55bc5dff
[formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]]]
Former-commit-id: 539faf0a71
Former-commit-id: 3be498b2fc
[formerly b062373048
] [formerly 7dca551d593dd1f6e0032c2e45684997afece6da [formerly 12d4316b3a
]]
Former-commit-id: f95250cfa48810db80f1dd3b8097e0dca13d4fad [formerly 9c51f2d15f
]
Former-commit-id: fbddfb5a25
2013-04-03 18:05:39 -04:00