Richard Peter
|
d289419c40
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]
Former-commit-id: 0074b774f0
Former-commit-id: 625647a717 [formerly b4aac09ff4] [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41]]
Former-commit-id: 2067b058e879c394c330dccfc1994698c7f7cb05 [formerly e2a16fd876]
Former-commit-id: 705339a320
|
2013-11-14 14:40:23 -06:00 |
|
Lee Venable
|
686d984163
|
Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: d42589d14f [formerly 6086c06f66] [formerly d431f3c0f4] [formerly d42589d14f [formerly 6086c06f66] [formerly d431f3c0f4] [formerly bc7f5e556d [formerly d431f3c0f4 [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]]
Former-commit-id: bc7f5e556d
Former-commit-id: b93b05165c [formerly 69934b9b32] [formerly 8b1c54f60a8cccda08a50dac70415ec886062e9b [formerly 17fef206fc]]
Former-commit-id: b05b8692e13600b879c8d4c9de8f0c9322ffe832 [formerly 84de0beae4]
Former-commit-id: ab512eaeb1
|
2013-11-14 14:33:18 -06:00 |
|
Richard Peter
|
24e58ea252
|
Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 7c5e85a288 [formerly 5c5e71a01b] [formerly 4d18c7d493] [formerly 7c5e85a288 [formerly 5c5e71a01b] [formerly 4d18c7d493] [formerly 3f5c590c5f [formerly 4d18c7d493 [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: df3e6735af [formerly 6af248f212] [formerly 493a9f0f3191b9c74a85050ff2e11f14b925c249 [formerly 3dc0ad184c]]
Former-commit-id: 90ff75232070f6fc3d10b664951a96a9876cc88b [formerly ace2a71092]
Former-commit-id: 7375a3b961
|
2013-11-14 13:30:09 -06:00 |
|
Nate Jensen
|
493fa54860
|
Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9517c96d68 [formerly a4eb19fc79] [formerly 9acda0b9f2] [formerly 9517c96d68 [formerly a4eb19fc79] [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly 9acda0b9f2 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]]
Former-commit-id: c5cf68cc45
Former-commit-id: ddcca3463d [formerly e41f57da67] [formerly a2b53d6aca5047e5514931e92e017ed5771c890d [formerly a6be904c69]]
Former-commit-id: 6f2e3001c41627a8a93fc22d02074369aa136e2d [formerly e83a828209]
Former-commit-id: 6441290b40
|
2013-11-14 13:29:30 -06:00 |
|
Bryan Kowal
|
fde6569c34
|
Issue #2540 - pure python module merge implementation
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching
Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1
Former-commit-id: 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7e35ea310f [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 8a0b0667de [formerly 4759e48c5c] [formerly 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3]]
Former-commit-id: 5339245b650c517d8012d02401b6076bf3cd1ed8 [formerly 79045d620b]
Former-commit-id: ae5e6b3927
|
2013-11-14 11:57:11 -06:00 |
|
Steve Harris
|
c214af60f6
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 361df767a8 [formerly 77ea1782c3] [formerly 473488f5b8] [formerly 361df767a8 [formerly 77ea1782c3] [formerly 473488f5b8] [formerly 4d25eb11c8 [formerly 473488f5b8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: d6ef4ae259 [formerly a75acc5499] [formerly 282970560ec2ee6eee13b9272e753fbb7d551416 [formerly ef852ac125]]
Former-commit-id: 495f8b46971170beee79e3e200e5aea8c63cfc3b [formerly 39e8f5ecc1]
Former-commit-id: 8307fe3a9f
|
2013-11-13 23:20:18 -06:00 |
|
Richard Peter
|
0e6f70cb31
|
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly e88f5777a7 [formerly 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]]
Former-commit-id: e88f5777a7
Former-commit-id: 42ac155685 [formerly ed258e9421] [formerly 5c494cb47ccf4d7292296be310025fbd46ce817f [formerly 64afe42e74]]
Former-commit-id: ce9e0daca12be42a0eea37a51d5530a1d4b7f8d1 [formerly 58c8106da8]
Former-commit-id: 0581cc53e5
|
2013-11-13 16:43:26 -06:00 |
|
Greg Armendariz
|
13f777cc62
|
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: a0b16bafee [formerly 06e3f849f0] [formerly 83ac36721b] [formerly a0b16bafee [formerly 06e3f849f0] [formerly 83ac36721b] [formerly 3f6281fdbe [formerly 83ac36721b [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]]]
Former-commit-id: 3f6281fdbe
Former-commit-id: 2d92a5719c [formerly b7c3a7e850] [formerly a557332626ac393163cd374e7ee121dc81df86a4 [formerly ce0a05242f]]
Former-commit-id: 571affa63254c2077485a938f0d063bd2b14e213 [formerly 977e0fab0e]
Former-commit-id: 8809254168
|
2013-11-13 15:30:55 -06:00 |
|
Brian Clements
|
bdf611db27
|
Issue #2505 removed recco from deployment
added update script to drop recco from db
Former-commit-id: 3204a2f7b5 [formerly 3551b731e0] [formerly 95f1621d3e] [formerly 3204a2f7b5 [formerly 3551b731e0] [formerly 95f1621d3e] [formerly 8cbe2c06a8 [formerly 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: b5b94646cf [formerly d2f0b73626] [formerly 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81 [formerly 49c8bd5ee9]]
Former-commit-id: 7384c5efc3b7d3bed603cfe7ab8ff291ceab0e23 [formerly d94f44d406]
Former-commit-id: 09101ca5ac
|
2013-11-13 13:45:44 -06:00 |
|
Bryan Kowal
|
89b9e26156
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 0544b66f4e [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]]
Former-commit-id: 0544b66f4e
Former-commit-id: ce40d40304 [formerly a2b1211c52] [formerly 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4]]
Former-commit-id: 52598106710ffd4583947f5428f98b7eb89170c3 [formerly 1a905e8a3c]
Former-commit-id: 97c0dff26a
|
2013-11-13 13:16:55 -06:00 |
|
Steve Harris
|
91027b38db
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 3e8014e9f8 [formerly eb470599f3] [formerly 0a37219d2a] [formerly 3e8014e9f8 [formerly eb470599f3] [formerly 0a37219d2a] [formerly 2e7a594d51 [formerly 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]]]]
Former-commit-id: 2e7a594d51
Former-commit-id: 6af0dcf567 [formerly 80c709b3f4] [formerly 30e7b1a9427f9e36f5c8eb8e65eb8f79733ce8fb [formerly bc45f3668b]]
Former-commit-id: 0e519fa7a1edf2e5477d6d7126baa658bb25f2d1 [formerly 1fdc64c7e7]
Former-commit-id: 661dbe2860
|
2013-11-13 11:34:17 -06:00 |
|
Steve Harris
|
7facd4fe25
|
14.1.1-8 baseline
Former-commit-id: 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 1902ca9cfb [formerly b7ca6163e3] [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9]]
Former-commit-id: 299bb48cc93fac70de777c99a73fd516cc085238 [formerly 42ece4fb6a]
Former-commit-id: d2104614be
|
2013-11-13 12:32:17 -05:00 |
|
Benjamin Phillippe
|
516cb4648c
|
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: 7b53fc40d4 [formerly c294d5d77a] [formerly 5cd030f096] [formerly 7b53fc40d4 [formerly c294d5d77a] [formerly 5cd030f096] [formerly 1c46226a11 [formerly 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]]
Former-commit-id: 1c46226a11
Former-commit-id: 7cbc9b4ef3 [formerly 1a19965daf] [formerly 02517e3b01d1874cc92736a35804499b6a45c0d6 [formerly fe7c6886c4]]
Former-commit-id: b488e8fc371f0360383d01dae50168e03ac18f75 [formerly 64a37e7672]
Former-commit-id: 7ae33612c5
|
2013-11-13 10:52:07 -06:00 |
|
Brian Clements
|
9d8010e1d8
|
Issue #1314 fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: 0991849617 [formerly 0d80fa7dc1] [formerly dfd88151e6] [formerly 0991849617 [formerly 0d80fa7dc1] [formerly dfd88151e6] [formerly 37f4f41d2d [formerly dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: c399d0394f [formerly c3a0ea3400] [formerly e50da8d67f3cc8f84bc4978a0aab417ea16a7c26 [formerly ef2acc6562]]
Former-commit-id: 43f5f85d2db77290d610b2bb501ffa92d7faa7cd [formerly ac221125f4]
Former-commit-id: eb9764b77b
|
2013-11-13 10:04:13 -06:00 |
|
Nate Jensen
|
d507cbd5dd
|
Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
Former-commit-id: 47f8811992 [formerly 51ba5f770c] [formerly 85923b0f7f] [formerly 47f8811992 [formerly 51ba5f770c] [formerly 85923b0f7f] [formerly c0ed705daf [formerly 85923b0f7f [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]]]
Former-commit-id: c0ed705daf
Former-commit-id: df8ddb3eac [formerly fad5c6d615] [formerly 8aeadacd76d9077469357c8afa7195a688cca933 [formerly a62e415724]]
Former-commit-id: 004d25305a2a74a752f4ba7a92f1b8bbb916144c [formerly b7085b0ed4]
Former-commit-id: 1c92fc757b
|
2013-11-13 09:01:09 -06:00 |
|
Brian Clements
|
2c76698c78
|
Issue #2546 added fix for TAFs that contain legacy valid times
added unit test
Former-commit-id: 04a9d3ae08 [formerly b0a5192dfa] [formerly 191ffc6e63] [formerly 04a9d3ae08 [formerly b0a5192dfa] [formerly 191ffc6e63] [formerly df1542a66c [formerly 191ffc6e63 [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]]
Former-commit-id: df1542a66c
Former-commit-id: 381a274111 [formerly bca5149811] [formerly 3ac020de4f913cf98382a5249c8fda9e76a0edaa [formerly 0e5d3e9e69]]
Former-commit-id: 31f963a907811d6d1817831b842056f2d9e806f2 [formerly b511453153]
Former-commit-id: 1d41861c3c
|
2013-11-13 08:07:29 -06:00 |
|
Bryan Kowal
|
1134d55c7b
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly e3639da703 [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]]
Former-commit-id: e3639da703
Former-commit-id: ad1e4c66b8 [formerly b2c63727ba] [formerly 9b2674319137dc98ffe2e221d63d5f3dae8f1e22 [formerly 48d5d8c3a1]]
Former-commit-id: 05930d677355374fbcc6438692928f1740b35460 [formerly a575f41589]
Former-commit-id: cfb3717a61
|
2013-11-12 19:57:25 -06:00 |
|
Bryan Kowal
|
6b9cae71e2
|
Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly d76033ff3d [formerly 7cac007ef1 [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]]]
Former-commit-id: d76033ff3d
Former-commit-id: d8a1e15951 [formerly e9ff5e018b] [formerly 08a3d0dc0c028b514f152d7d2df94af1610acc50 [formerly 084d772588]]
Former-commit-id: 5a7b66c6f75c115cad84c4d0aaf076e8a21ad3a3 [formerly 8867114ff8]
Former-commit-id: d83504922b
|
2013-11-12 17:43:10 -06:00 |
|
Nate Jensen
|
ad4f555802
|
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: b59a0230e5 [formerly f2f778c042] [formerly accfefae6d] [formerly b59a0230e5 [formerly f2f778c042] [formerly accfefae6d] [formerly f0b386b632 [formerly accfefae6d [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]]
Former-commit-id: f0b386b632
Former-commit-id: 793a7f6544 [formerly ec073efd45] [formerly dfb26a2628a5b054a3463a05d41c518dd8e86068 [formerly 80227c4750]]
Former-commit-id: 73824090615da78d44f25ffa6e0796a9268ffcc8 [formerly 633faf692b]
Former-commit-id: 6b4284ec55
|
2013-11-12 16:55:31 -06:00 |
|
Nate Jensen
|
a9d73bb3fa
|
Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: decad66d76 [formerly 8df2c48648] [formerly 8cf1b752e0] [formerly decad66d76 [formerly 8df2c48648] [formerly 8cf1b752e0] [formerly b1d376e238 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]]
Former-commit-id: b1d376e238
Former-commit-id: ad6d935205 [formerly b0cfb6e836] [formerly 50151ea1ec6e4d1ca1d0f68de456f2de9ac40c8f [formerly 645e816d5d]]
Former-commit-id: 8056424dfb851f8b8deb8e86c061748dbf6ffbc1 [formerly 983afa0eea]
Former-commit-id: abf56dec05
|
2013-11-12 16:48:32 -06:00 |
|
Dave Hladky
|
6ee91eff8a
|
Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 80ce7ec3e7 [formerly 5313c8b68d] [formerly 643a150777] [formerly 80ce7ec3e7 [formerly 5313c8b68d] [formerly 643a150777] [formerly e3a259182c [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]]
Former-commit-id: e3a259182c
Former-commit-id: b467763805 [formerly f2f670bc00] [formerly a4fec8aeeb03e65d82a83a1808e0fa6530ced21e [formerly 53866e481a]]
Former-commit-id: 454826e2ebc64df06b520cf75175b5fe9f328956 [formerly 86363574b3]
Former-commit-id: fa2238778d
|
2013-11-12 14:55:41 -06:00 |
|
Nate Jensen
|
03c16ff64b
|
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
Former-commit-id: 568e9dacba [formerly edb2b6d217] [formerly 5e02427d6e] [formerly 568e9dacba [formerly edb2b6d217] [formerly 5e02427d6e] [formerly c60228c854 [formerly 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]]]
Former-commit-id: c60228c854
Former-commit-id: 8dacce7f9b [formerly c6e10ebdef] [formerly 5dddfaa7f46782e5270d7070d02a28f1d2f20a01 [formerly a1315f1072]]
Former-commit-id: 2e43027e215f7cefcc48aa4b0df6ded67da6bbd2 [formerly a53cf1a079]
Former-commit-id: 73d6499cc0
|
2013-11-12 14:41:34 -06:00 |
|
Greg Armendariz
|
df22d0db38
|
Issue #2512 - Remove dead code
Former-commit-id: b429bf2588 [formerly 59f8eb9341] [formerly 4f4d59aa52] [formerly b429bf2588 [formerly 59f8eb9341] [formerly 4f4d59aa52] [formerly 70c9a36826 [formerly 4f4d59aa52 [formerly c07118fed79b6e50694281e40b3fb3755484d911]]]]
Former-commit-id: 70c9a36826
Former-commit-id: 12dfecc863 [formerly f878a8e302] [formerly 1d7219743606de751141dfd69c8aab0a62160ea6 [formerly fbcb810ab3]]
Former-commit-id: c2036e42c06dfb0f3938cd763917db7377259c64 [formerly 3852935abf]
Former-commit-id: bbd6cd614b
|
2013-11-12 14:20:21 -06:00 |
|
Richard Peter
|
b4e255a976
|
Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development
Former-commit-id: 8214774545 [formerly c25ba19514] [formerly 9af1de07d4] [formerly 8214774545 [formerly c25ba19514] [formerly 9af1de07d4] [formerly f12839a9e5 [formerly 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]]]]
Former-commit-id: f12839a9e5
Former-commit-id: 51f9a7fe54 [formerly 502d67591b] [formerly d63f1f5f4506e36003ebe3658bbae7045d51f7d9 [formerly c8ff79a7f5]]
Former-commit-id: a6a02709b082eebc1c33d818028dc638fba6569a [formerly 0cf51fce74]
Former-commit-id: 7855a8f000
|
2013-11-12 13:47:04 -06:00 |
|
Nate Jensen
|
5e53b2d074
|
Issue #2361 better logging of viz spring initialization of bundles
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b
Former-commit-id: 821c8d2a30 [formerly 6707d1aadf] [formerly 692ea76d75] [formerly 821c8d2a30 [formerly 6707d1aadf] [formerly 692ea76d75] [formerly a4ece1d116 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]]]
Former-commit-id: a4ece1d116
Former-commit-id: 25047d10d5 [formerly 4b329513e5] [formerly bb48885fad4303574e632bfa0ef5cef5bf842c6d [formerly 2e86520b53]]
Former-commit-id: fbb07670a286e23a919608b81c889cfa4b8bd22f [formerly 5c7be238a0]
Former-commit-id: ec0025a309
|
2013-11-12 13:02:49 -06:00 |
|
Nate Jensen
|
fddb55dc4d
|
Merge "Issue #2448 fix scheduling for start/stop of subscription." into development
Former-commit-id: 05068bb1f3 [formerly db61d36b4e] [formerly 88af1ddfcb] [formerly 05068bb1f3 [formerly db61d36b4e] [formerly 88af1ddfcb] [formerly 64aa00bad6 [formerly 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]]]]
Former-commit-id: 64aa00bad6
Former-commit-id: f673de2e99 [formerly 7a5f716d70] [formerly 9e53a2808b9310818f353602936e9b93270e44e7 [formerly 39679b0608]]
Former-commit-id: 31537865a0c927339a6d678895ead733e422918e [formerly f618186c69]
Former-commit-id: db3a33864f
|
2013-11-12 12:46:38 -06:00 |
|
Brad Gonzales
|
0aa3b220bf
|
Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes.
Amend: Separate update from create notifications in LifecycleManagerImpl.
Refactored notification sending in EdexBandwidthManager.
Fixed error in LifecycleManagerImpl refactor.
Added comment to isRecurringSubscription.
Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77
Former-commit-id: 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly 50fb18601c [formerly 62e4cafa27] [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]]
Former-commit-id: aea0e847aa
Former-commit-id: 725742f4ec [formerly 7747d901f7] [formerly 690f66cc7e89cdd24f8b28a0befbcc33117dfd20 [formerly 866a11a9f0]]
Former-commit-id: 0b81bcbc6ab893fa04a28ec2f1a491d80e5eeec8 [formerly bad9b3242a]
Former-commit-id: a626b240ce
|
2013-11-12 12:42:16 -06:00 |
|
Brian Clements
|
89f460969d
|
Issue #2539 removed java 7 specific code from exception subclass
Former-commit-id: e9b4f777e1 [formerly 9f7e85450d] [formerly 8b0e85f82c] [formerly e9b4f777e1 [formerly 9f7e85450d] [formerly 8b0e85f82c] [formerly 4050eb5f3e [formerly 8b0e85f82c [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]]]]
Former-commit-id: 4050eb5f3e
Former-commit-id: 3351401cb6 [formerly 4d3c2f488c] [formerly 6cca22845871692e5d67bd3e6d781e22aab81c7d [formerly ba12c7467d]]
Former-commit-id: dc41493dc42e3f081d5a737dff2eb4134616deaa [formerly 94a9ea2ff0]
Former-commit-id: b970c720de
|
2013-11-12 12:41:50 -06:00 |
|
Nate Jensen
|
361eb30aaf
|
Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development
Former-commit-id: 1747b23290 [formerly b71f2463da] [formerly 3f86a3735e] [formerly 1747b23290 [formerly b71f2463da] [formerly 3f86a3735e] [formerly eed4c8604b [formerly 3f86a3735e [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]]]]
Former-commit-id: eed4c8604b
Former-commit-id: 0c999d40dd [formerly b0600c60ce] [formerly e300fc5ad7ce2f811eabeaaee0fd88234f5a7008 [formerly 18d790a423]]
Former-commit-id: 99218aaf830cc33d3e91fd60286e630f42edca21 [formerly 1f4af0c06a]
Former-commit-id: 6185a257df
|
2013-11-12 12:13:58 -06:00 |
|
Richard Peter
|
680a54d2d5
|
Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development
Former-commit-id: 7bd2cdb170 [formerly 4d82382054] [formerly 8afc87e570] [formerly 7bd2cdb170 [formerly 4d82382054] [formerly 8afc87e570] [formerly 61fc3eba44 [formerly 8afc87e570 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]]]]
Former-commit-id: 61fc3eba44
Former-commit-id: be32cf8237 [formerly d66aaa7746] [formerly b49bd79f027e2a7d4129d4e1a9aa4cdf3f6a55d0 [formerly b8b01f6305]]
Former-commit-id: bf183aa6e0aa24b2877bc67aebb4d6c8dfeaed01 [formerly c60b0849b3]
Former-commit-id: 24eb06f591
|
2013-11-12 11:18:56 -06:00 |
|
Richard Peter
|
ff729f46b5
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.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
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 061fa07147 [formerly 7ba466f5a6] [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 112816a54c [formerly 3f68fc6eed] [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d]]
Former-commit-id: 8b93a7813019963981a150f64ec44daf5d188cde [formerly c8ef435295]
Former-commit-id: ef23a8f65b
|
2013-11-12 11:11:36 -06:00 |
|
Nate Jensen
|
0c2d27c3ca
|
Issue #2361 static lazy initialization of SubscriptionOverlapService's
JAXBManager
Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac
Former-commit-id: a1fadcf38f [formerly 6c016a6bb6] [formerly 1ee5d91af2] [formerly a1fadcf38f [formerly 6c016a6bb6] [formerly 1ee5d91af2] [formerly 2cdc7e5e63 [formerly 1ee5d91af2 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]]]]
Former-commit-id: 2cdc7e5e63
Former-commit-id: e2db59a055 [formerly 98cbafe95c] [formerly 62f6799a9e992798bc661107dd6e08c64c9810c5 [formerly 368d73449e]]
Former-commit-id: a37e5bc8d3f0a758722efebc08d2981f350a0deb [formerly 66ff41e961]
Former-commit-id: b92c73f16f
|
2013-11-12 11:03:51 -06:00 |
|
Dave Hladky
|
5b4297b398
|
Issue #2448 fix scheduling for start/stop of subscription.
Former-commit-id: af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly 976eece1b1 [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]]]]
Former-commit-id: 976eece1b1
Former-commit-id: 3d5ca2453b [formerly 3f5b80e5b3] [formerly 18e585f452f18b7b112c96e0494390595d97c58e [formerly 753b36cfea]]
Former-commit-id: 2fbe443c2e385e5f4ebf6922d2f5d909c21e1fcc [formerly e410d1f44b]
Former-commit-id: 6a9c0a6fa8
|
2013-11-12 10:58:50 -06:00 |
|
Nate Jensen
|
7cd003eda9
|
Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development
Former-commit-id: 695f25ba66 [formerly 3480148f14] [formerly bca5793e3d] [formerly 695f25ba66 [formerly 3480148f14] [formerly bca5793e3d] [formerly da8a858727 [formerly bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]]]
Former-commit-id: da8a858727
Former-commit-id: 493d79f524 [formerly ddebd81c73] [formerly 9671b7375763905e318a2a92acb4933c27a059b8 [formerly d758e5ab57]]
Former-commit-id: 58b849d5f1654c0d9121acbfd8935de1329365c0 [formerly f1b25ed227]
Former-commit-id: 83c9d010c4
|
2013-11-12 10:55:40 -06:00 |
|
Brad Gonzales
|
3c70ba2cb4
|
Issue #2506 Added subscription notification service to bandwidth manager.
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92
Former-commit-id: 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly ff5edde334 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]]]
Former-commit-id: ff5edde334
Former-commit-id: 66d22943ed [formerly 1987184f87] [formerly 368a51ec44c83075967d0b8589b3b09c44ba8b74 [formerly efdc64b7b3]]
Former-commit-id: 4f74e3c469450a036eb47f21a5ab1ff474af8c5c [formerly 1b084e4efa]
Former-commit-id: b7fca60f7d
|
2013-11-12 10:50:06 -06:00 |
|
Nate Jensen
|
7cc8abb191
|
Merge "Issue #2377 fixed error handling in QPF config" into development
Former-commit-id: 881e9efc68 [formerly 74d7dfd7da] [formerly 3054868350] [formerly 881e9efc68 [formerly 74d7dfd7da] [formerly 3054868350] [formerly d8f2ffbceb [formerly 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]]]
Former-commit-id: d8f2ffbceb
Former-commit-id: d1e5b5e0dc [formerly 5899801877] [formerly 30a720690f9ddf9e80cde824f8524806bc0200e8 [formerly 68866c322c]]
Former-commit-id: 2f10d09e884cba80b4ac4bc61e8a1f5765b66353 [formerly f55aa5aea0]
Former-commit-id: 1ed84f8f63
|
2013-11-12 10:39:51 -06:00 |
|
Nate Jensen
|
bec280fb55
|
Merge "Issue #2539 added GZIP support to WFS REST" into development
Former-commit-id: bf4406d124 [formerly cd5b0576b0] [formerly f1b8eecca7] [formerly bf4406d124 [formerly cd5b0576b0] [formerly f1b8eecca7] [formerly 8c4608630d [formerly f1b8eecca7 [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]]]
Former-commit-id: 8c4608630d
Former-commit-id: d2f15c928c [formerly f240b80d6f] [formerly 7d794297e4516fd184a29fd40a964387c686691f [formerly b87efc6860]]
Former-commit-id: d7ddd5c3a83b55a35e8b7a2821a82a402fd86098 [formerly 81749eac08]
Former-commit-id: fd3fdf9b16
|
2013-11-12 10:39:44 -06:00 |
|
Nate Jensen
|
40ea9ef7bc
|
Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7
Former-commit-id: 1174d22160 [formerly 2c0c20f01e] [formerly b52bdb1cec] [formerly 1174d22160 [formerly 2c0c20f01e] [formerly b52bdb1cec] [formerly 7a73c65430 [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]]
Former-commit-id: 7a73c65430
Former-commit-id: f91ac1953e [formerly 9bf83be7e9] [formerly 760e4eea3b71bfcf5ae883d95ff74e375ec4bfc6 [formerly 5427e68fd2]]
Former-commit-id: 79abcb5632535338409c08045b873998da0ecaef [formerly 80c38e1433]
Former-commit-id: 273eb805c0
|
2013-11-12 10:37:54 -06:00 |
|
Nate Jensen
|
2a8ab782d9
|
Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development
Former-commit-id: 178e212c4b [formerly 8ff0d1129a] [formerly 3ed50ff500] [formerly 178e212c4b [formerly 8ff0d1129a] [formerly 3ed50ff500] [formerly 23fe7de462 [formerly 3ed50ff500 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]]]
Former-commit-id: 23fe7de462
Former-commit-id: d3cadd78d6 [formerly c84ff18213] [formerly bbd9ec0c716072ceca26f944c7f0c8aec819db11 [formerly 90320ab47a]]
Former-commit-id: 045aa7ae34ea554793e18d0e4a7e5292445bcbfa [formerly da95b6f03e]
Former-commit-id: 47e4b7e7e6
|
2013-11-12 09:29:46 -06:00 |
|
Bryan Kowal
|
25bbbb75b1
|
Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later.
Amend: addressed review comments
Amend: update DR number
Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0
Former-commit-id: d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly 75e6914df1 [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]]]
Former-commit-id: 75e6914df1
Former-commit-id: 5bfc4d4dda [formerly 1a966d8ec2] [formerly 117ea92d58b5f7e0d20d3bd89d1f4e7c6c26b7f1 [formerly 5c38f0bfd6]]
Former-commit-id: 4274b56b364d7382bd0a540b4a1fb3f80b4ad82e [formerly 2565306c95]
Former-commit-id: adf5ac93ae
|
2013-11-11 17:00:17 -06:00 |
|
Brian Clements
|
f6bd71af1c
|
Issue #2377 fixed error handling in QPF config
Former-commit-id: 6faded726a [formerly 23e9ac6aa8] [formerly e2ac7ae212] [formerly 6faded726a [formerly 23e9ac6aa8] [formerly e2ac7ae212] [formerly 684bd4dc50 [formerly e2ac7ae212 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]]]]
Former-commit-id: 684bd4dc50
Former-commit-id: 407884f08e [formerly 368223de1f] [formerly a089b8911c036cdf25eb53efbf261c6116d81cf6 [formerly c6f8609b39]]
Former-commit-id: 48b5dd3e522a5099b76c78644a592fbab63bcd8e [formerly 6b051e1513]
Former-commit-id: 39f4ee7d0d
|
2013-11-11 16:18:16 -06:00 |
|
Nate Jensen
|
bf6bd95340
|
Issue #2361 undo earlier changes that potentially break uengine based
local apps
Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65
Former-commit-id: cf88b536e0 [formerly bb93c18e7d] [formerly 8628b7755e] [formerly cf88b536e0 [formerly bb93c18e7d] [formerly 8628b7755e] [formerly a2935193b5 [formerly 8628b7755e [formerly 110cff66bb2cf847730562570a9415851e0362c2]]]]
Former-commit-id: a2935193b5
Former-commit-id: e62a756cbc [formerly e1138809e7] [formerly 32cf218a7d8218d000be9f55fd45198a966abf60 [formerly 9dc69e316f]]
Former-commit-id: 3d8ba4a78981bc94ebb58b70b40e630f9143b086 [formerly 5c30fd5b5c]
Former-commit-id: cad09aed0b
|
2013-11-11 16:14:35 -06:00 |
|
Brian Clements
|
376a275bb9
|
Issue #2539 added GZIP support to WFS REST
small code cleanup in providers
Former-commit-id: 9934916ec7 [formerly 02ab14579f] [formerly 36a0be2db1] [formerly 9934916ec7 [formerly 02ab14579f] [formerly 36a0be2db1] [formerly 061515b485 [formerly 36a0be2db1 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]]]]
Former-commit-id: 061515b485
Former-commit-id: 9c04028981 [formerly 7cba0ca3c1] [formerly 0196637c33858fef7c310554bbe9d076877097b6 [formerly 24905af3c4]]
Former-commit-id: 63a921c552cda1132674befc9dfe3862dd65c14a [formerly 587c9ad61c]
Former-commit-id: 6a34b316d6
|
2013-11-11 16:08:09 -06:00 |
|
Steve Harris
|
6eef8d8e32
|
Merge branch 'omaha_13.5.3' into development
Former-commit-id: 3046218ffa [formerly 51af205d06] [formerly 9dabbc7b8e] [formerly 3046218ffa [formerly 51af205d06] [formerly 9dabbc7b8e] [formerly 66f99f3974 [formerly 9dabbc7b8e [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]]]
Former-commit-id: 66f99f3974
Former-commit-id: 6c1b10ef38 [formerly 48997c36f0] [formerly 0a548e3ee4a8da8b1016d683c486d04b1f3f4cdd [formerly 9f1d93a2cf]]
Former-commit-id: ec44cc1043b33e1360f170cce96935075a9f1947 [formerly 92cf79a7cc]
Former-commit-id: b8cf485614
|
2013-11-11 15:40:45 -06:00 |
|
Steve Harris
|
f4b408e0b3
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 1a49b03f89 [formerly 00a64f061d] [formerly c1dcded2bd] [formerly 1a49b03f89 [formerly 00a64f061d] [formerly c1dcded2bd] [formerly e0d2de3a19 [formerly c1dcded2bd [formerly d55e0256167a6b61728d77403805ccc1c3eafdf7]]]]
Former-commit-id: e0d2de3a19
Former-commit-id: dffea727be [formerly 5b789ef8b0] [formerly 7ef46b17621b2c5d7650aa762a0c86f5ec0633aa [formerly 0d4e6712f8]]
Former-commit-id: a1bb671894b1712dc150d37f9e3ff285b8ca499f [formerly f4638935b7]
Former-commit-id: b39bff6544
|
2013-11-11 15:39:27 -06:00 |
|
Steve Harris
|
c4fd576469
|
13.5.3-7 baseline
Former-commit-id: 130ad51d0c [formerly 36af5686bd] [formerly 21bed95fa4] [formerly 130ad51d0c [formerly 36af5686bd] [formerly 21bed95fa4] [formerly 47102ee47b [formerly 21bed95fa4 [formerly a9ada72dc63cd460499052171c61323b438bb10d]]]]
Former-commit-id: 47102ee47b
Former-commit-id: c698e151f2 [formerly 142f1201b3] [formerly 06258f044b934f4063d605764f82c7d974d58d0b [formerly 3599d7f09b]]
Former-commit-id: 6a389eb04484293d069113e90ee3e6f4cb61556a [formerly 0c54c50443]
Former-commit-id: 889db4bc7b
|
2013-11-11 16:33:51 -05:00 |
|
Nate Jensen
|
46fd118602
|
Merge "Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing." into development
Former-commit-id: a349a980d3 [formerly a3fd84d9ef] [formerly 7dda17a660] [formerly a349a980d3 [formerly a3fd84d9ef] [formerly 7dda17a660] [formerly 05ee46c4bc [formerly 7dda17a660 [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]]]]
Former-commit-id: 05ee46c4bc
Former-commit-id: bdfe31ca9d [formerly 208cc6a534] [formerly bde810fa0fc654c54b6988c3f5dabe5ab75424e3 [formerly 64df0d8d8f]]
Former-commit-id: f5d0c26157b0203df59e509eceb3715e4f4503f8 [formerly 175cc8dd74]
Former-commit-id: 3ef3e4453d
|
2013-11-11 14:05:11 -06:00 |
|
Richard Peter
|
2de2d7caf1
|
Merge "Issue #2506 Refactored RegistryEvent constructors." into development
Former-commit-id: 8a3069e8e3 [formerly d55e99dc2d] [formerly 13989d9c6e] [formerly 8a3069e8e3 [formerly d55e99dc2d] [formerly 13989d9c6e] [formerly 51649b56e5 [formerly 13989d9c6e [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]]]]
Former-commit-id: 51649b56e5
Former-commit-id: 9600b1a10e [formerly 0e1ec70a0d] [formerly 01640204f77e3bf9716a94b6d6df69c22e18cadd [formerly 8db2d589e3]]
Former-commit-id: 20ceb44a11e028f3d19c229ae8168e464ecb87fe [formerly a40c837424]
Former-commit-id: a053714acf
|
2013-11-11 13:09:24 -06:00 |
|
Bryan Kowal
|
f190760123
|
Issue #2297 - fix 14.2.1 merge
Former-commit-id: 8d412d7aa0 [formerly fee6a5dc9c] [formerly e2a02ca247] [formerly 8d412d7aa0 [formerly fee6a5dc9c] [formerly e2a02ca247] [formerly 411e0fa7c4 [formerly e2a02ca247 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]]]
Former-commit-id: 411e0fa7c4
Former-commit-id: 608f00417e [formerly b1a6d2d828] [formerly 9608fdc09cce1ba5077a173bab8ffc316408830f [formerly e937ba954b]]
Former-commit-id: 0775c166800f807532941473117b90119faa9398 [formerly 18bb3ef947]
Former-commit-id: f986662369
|
2013-11-11 13:04:21 -06:00 |
|
Steve Harris
|
8c0239d4e9
|
Merge branch 'omaha_13.5.3' (13.5.3-6) into development
Former-commit-id: cf9f426faa [formerly 33e02b548d] [formerly fbfe1a5faf] [formerly cf9f426faa [formerly 33e02b548d] [formerly fbfe1a5faf] [formerly 8a2e9f1725 [formerly fbfe1a5faf [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]]]]
Former-commit-id: 8a2e9f1725
Former-commit-id: ef183dd7af [formerly 4e09ce78c8] [formerly acaa9065d51878d26f0253e193ea63bd14a6d273 [formerly b4fe17406f]]
Former-commit-id: f7cc13eda46ebb68547c95ae89a815a7690440c4 [formerly 76ca0835e7]
Former-commit-id: c9bbd30adf
|
2013-11-11 11:45:35 -06:00 |
|