Nate Jensen
|
ff64bf589b
|
Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6
Former-commit-id: 5eef22fd4d [formerly c0f95eb55a ] [formerly 81fc4fa753 ] [formerly c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9 ]
Former-commit-id: afae330d8a
|
2013-06-19 10:16:06 -05:00 |
|
Dustin Johnson
|
27a2717d88
|
Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576
Former-commit-id: 89a179ab97 [formerly 1e7c85a592 ] [formerly 1494a604ae1cff7c7ecb8ca757c674dc2c661557 [formerly 6f8246262b ]] [formerly 314331c9a4 [formerly 6f8246262b [formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]]]
Former-commit-id: 314331c9a4
Former-commit-id: cb5dabe6a8d083d3beec439c06b863290f719aae [formerly dab308afc8 ]
Former-commit-id: a0d8e1dc0c
|
2013-06-19 08:56:43 -05:00 |
|
Dustin Johnson
|
73e70fe69a
|
Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7
Former-commit-id: e8511a53ad [formerly b9d8e444b3 ] [formerly 9bc7c854ab ] [formerly 7ee918a548 [formerly 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]]
Former-commit-id: 7ee918a548
Former-commit-id: 0bda58a8028b819a68146a811f6632e8d08a2202 [formerly 50cb2e26a2 ]
Former-commit-id: e7a679ebc7
|
2013-06-18 12:34:25 -05:00 |
|
Roger Ferrel
|
5153afecf9
|
Issue #1966 Column sort added; bug fixes to size estimates and saving files.
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa
Former-commit-id: 9fd68957ab [formerly e16bfeee80 ] [formerly f175b19a93 ] [formerly c7c27c4cbb [formerly f175b19a93 [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: d71c1b150fba58dabc2a498d16fe41be9f173bcf [formerly cc39af5044 ]
Former-commit-id: 28342fdfed
|
2013-06-18 08:56:54 -05:00 |
|
Steve Harris
|
a5fb9b721d
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts (self-resolved with kdiff3):
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
Former-commit-id: dadf03acaf [formerly 41748175b6 ] [formerly 8a27d96b844873d84abafe2421e8bfc28bd9b9a6 [formerly 97631f9c62 ]] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]
Former-commit-id: 40359c27c3
Former-commit-id: adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea ]
Former-commit-id: 0e4504c0fa
|
2013-06-17 15:25:32 -05:00 |
|
Steve Harris
|
0f83e19dab
|
13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00 ] [formerly adb779323d ] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7 ]
Former-commit-id: ccd66c0724
|
2013-06-17 15:01:22 -04:00 |
|
Richard Peter
|
dff4f07024
|
Merge "Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg." into omaha_13.5.1
Former-commit-id: a8998ba493 [formerly 16201b8155 ] [formerly e03c8216ad1b651d464b8d3b42777ad897030bd0 [formerly bee6ba6698 ]] [formerly 8cdc6993d5 [formerly bee6ba6698 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: 95a90dc36e9b9926ad08d6da254db469f03996fa [formerly 20b7af86f6 ]
Former-commit-id: 7d773e02ca
|
2013-06-14 10:06:34 -05:00 |
|
Nate Jensen
|
f173cc29e1
|
Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b
Former-commit-id: a7573825c6 [formerly f55b3cbdbe ] [formerly c2faa0e3bf ] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded ]
Former-commit-id: 4a39d586d2
|
2013-06-13 11:39:30 -05:00 |
|
Roger Ferrel
|
0954bf6d54
|
Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg.
Change-Id: If485480b6d8727d830620464741c2e748f2209dd
Former-commit-id: cbf8ad8f7b [formerly d2ac7bd433 ] [formerly 753f19b309 ] [formerly a405684c7b [formerly 753f19b309 [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]]
Former-commit-id: a405684c7b
Former-commit-id: 62d48cc824e8c115ac1613fb585e1323080737dd [formerly f64db73aef ]
Former-commit-id: ab93641992
|
2013-06-13 10:57:19 -05:00 |
|
Dustin Johnson
|
7a196095cb
|
Issue #2038 Correct required size estimations for subscription updates
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0
Former-commit-id: c22c156945 [formerly 757c711d2e ] [formerly 9156ec8c2d ] [formerly 94eeac2f7d [formerly 9156ec8c2d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]]
Former-commit-id: 94eeac2f7d
Former-commit-id: a02c9d52556a7097e15119b2711569548c47a69b [formerly c227436a3e ]
Former-commit-id: e383aa83e1
|
2013-06-12 14:52:49 -05:00 |
|
Nate Jensen
|
196e111978
|
Issue #1989 fix wrapper.conf
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce
Former-commit-id: bf7b56460b [formerly dae8945d1a ] [formerly 30f9bba5c4 ] [formerly 08eb034abc [formerly 30f9bba5c4 [formerly 5b8d1fafd2f2a1696f4f39d0cc6ddcb817054126]]]
Former-commit-id: 08eb034abc
Former-commit-id: b8cfd5aa892536823fe2becc29ee2fb4824b6c94 [formerly 53784c5a86 ]
Former-commit-id: 8516c28fdf
|
2013-06-12 14:05:15 -05:00 |
|
Mike Duff
|
c1809b7e31
|
Issue #2064 - Corrected Time object storage on subscriptions
Change-Id: I7cb4f53fd8dcdb2fc93ffd15c3a0c72e7eeb57d0
Former-commit-id: 03ef15d7b8 [formerly 5aabcd3001 ] [formerly a7f277c67b ] [formerly 0846f7c79a [formerly a7f277c67b [formerly 250fb3c4f8df45d396bc76734ad8b198dcf40a4e]]]
Former-commit-id: 0846f7c79a
Former-commit-id: 6a249650dbb1ffd6f61ae7e2b311375b44f5e9f4 [formerly ec08442f5d ]
Former-commit-id: 1357c03113
|
2013-06-12 11:12:05 -05:00 |
|
Dustin Johnson
|
fa2ebeebb8
|
Issue #2038 Delta script should also update providers in the database
Change-Id: I07f058af1702d43f3aa60f0a8646b016f6866b3b
Former-commit-id: 82523d84c4 [formerly 2b5daedc75 ] [formerly f361c49484 ] [formerly 14c7d2d81e [formerly f361c49484 [formerly de9efbe2f2a74f5c2b2d730153f4831f0c17336e]]]
Former-commit-id: 14c7d2d81e
Former-commit-id: 70a55bfe422d0b5ae314fca120998327360852d3 [formerly 582c618ace ]
Former-commit-id: b0658fda21
|
2013-06-10 15:36:47 -05:00 |
|
Steve Harris
|
43b7a9b410
|
13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950 ] [formerly 998961612c ] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e ]
Former-commit-id: 0aab285b8a
|
2013-06-10 15:17:17 -04:00 |
|
Richard Peter
|
568741e896
|
Merge "Issue #2038 Add support for point data type subscriptions to BandwidthManager" into development
Former-commit-id: 557a051e93 [formerly 9c3d79ad8e ] [formerly 05c82feceb ] [formerly 286d19c182 [formerly 05c82feceb [formerly a64228266a146ecb9a27381d9422c7b9bef56dac]]]
Former-commit-id: 286d19c182
Former-commit-id: cd0d917e43bfc2830ac6f82fe2721abac4a6bba7 [formerly 11ebd89a2c ]
Former-commit-id: 3eeaf1db8b
|
2013-06-10 11:46:13 -05:00 |
|
Dustin Johnson
|
ced2e3c267
|
Issue #2038 Add support for point data type subscriptions to BandwidthManager
Amend: Peer review comments, improve time considerations for Point subscriptions
Change-Id: I9dde7f7da9dab9c8f3163a87b1ebe64303fc7dc2
Former-commit-id: 8cb1003277 [formerly 63f8ff76c3 ] [formerly 7c4a6261fc ] [formerly c677ae32d7 [formerly 7c4a6261fc [formerly f7ed3ec86188635eb069878ac490af06ea98e4a2]]]
Former-commit-id: c677ae32d7
Former-commit-id: 457cb107ce779c0a15b15e7282c6d84bed9e4756 [formerly 3ec421b779 ]
Former-commit-id: ebf61027ff
|
2013-06-10 11:37:37 -05:00 |
|
Nate Jensen
|
f11448490a
|
Merge "Issue #1638 Made DataURIUtil populate all fields in the data map and using the dataURI cached accessors when applicable." into development
Former-commit-id: 3150572a9f [formerly d9c0800441 ] [formerly aced5003a4 ] [formerly aeee0ffbbd [formerly aced5003a4 [formerly 417d339cc96fdafb6e55287494aaf6276fea01a6]]]
Former-commit-id: aeee0ffbbd
Former-commit-id: d0903d48b4f680fc42fb437036b35bd40ef9c0de [formerly 096e5fc2a6 ]
Former-commit-id: 7b7e96cedc
|
2013-06-10 11:04:21 -05:00 |
|
Nate Jensen
|
971cd75f0d
|
Merge "Issue #1981 - OUPRequest is now a privileged request. Also proctecting TafQueueRequest" into development
Former-commit-id: f826ecefa2 [formerly 965ac61515 ] [formerly 2b823f6758 ] [formerly 474e0ac925 [formerly 2b823f6758 [formerly 35b47a9d54273ae8f9edcec731837cb85e928faf]]]
Former-commit-id: 474e0ac925
Former-commit-id: 39b4ef034836bb30e5a58a646b37ca339e05f7ca [formerly beee941ae5 ]
Former-commit-id: 3b4c9decfd
|
2013-06-10 11:02:01 -05:00 |
|
Max Schenkelberg
|
7f4a2134ee
|
Issue #1638 Made DataURIUtil populate all fields in the data map and using the dataURI cached accessors when applicable.
Change-Id: I2659ff03a934df90e8af7491bf46ff80148b267e
Former-commit-id: 919ef02486 [formerly fe3142bb36 ] [formerly 15f406c366 ] [formerly 2160f5a524 [formerly 15f406c366 [formerly 7521bf8c90c8066d6797b29c5115818921270615]]]
Former-commit-id: 2160f5a524
Former-commit-id: 474eb69da3d261b7abdcf0b939cb40d441cd5000 [formerly f907ad9785 ]
Former-commit-id: 038d370895
|
2013-06-10 10:41:42 -05:00 |
|
Mike Duff
|
0e97feb7a8
|
Issue #1981 - OUPRequest is now a privileged request.
Also proctecting TafQueueRequest
Change-Id: I3a05a407a21b8f9d2e6426c4f456e2218479242a
Former-commit-id: 106f3b0e5f [formerly 386cdeeba6 ] [formerly ee5e9c1435 ] [formerly 37cdcc0b0b [formerly ee5e9c1435 [formerly acc1b993db8d78f7edfc3bd287b7d3ca39c0d391]]]
Former-commit-id: 37cdcc0b0b
Former-commit-id: 7ac11963294af4e6011792073457c4e01f799c33 [formerly c293c466c1 ]
Former-commit-id: a614c16aba
|
2013-06-07 15:52:02 -05:00 |
|
Richard Peter
|
f66b175716
|
Merge "Issue #1966 Working case generation without compression. Changes to Retention to remove compile errors." into development
Former-commit-id: 5f293cb6a5 [formerly a24c41e40e ] [formerly 794b9a70f3 ] [formerly 878435ddd9 [formerly 794b9a70f3 [formerly dd8e9aa61642ba6498bbf5871ed6c8372ec468d0]]]
Former-commit-id: 878435ddd9
Former-commit-id: 4f1aa450bbfdadc16139ef91b7bdca090674ee43 [formerly 22ac30e0a6 ]
Former-commit-id: d3913f5da9
|
2013-06-07 15:05:08 -05:00 |
|
Bryan Kowal
|
b8c1830d3f
|
Issue #1927 - webapps will now self-identify themselves
Former-commit-id: 85e8a629cb [formerly 1a083a2cfc ] [formerly 9bd2741e22 ] [formerly 5056e2a0fa [formerly 9bd2741e22 [formerly 67787a77b4211ff74d34be7e33d26fa439cc9492]]]
Former-commit-id: 5056e2a0fa
Former-commit-id: 7b11c6cd300b33c08a7d730784d27a1a20220458 [formerly baffa90082 ]
Former-commit-id: 16bf16c04d
|
2013-06-07 13:47:20 -05:00 |
|
Greg Armendariz
|
72e73cc94b
|
Merge "Issue #1927 - remove obsolete files" into development
Former-commit-id: 5313236e3b [formerly e220ed1ae4 ] [formerly 367d9850b3 ] [formerly afed5f12a0 [formerly 367d9850b3 [formerly e19a1da294b9d0e34c126537a13a12e8aba8f35f]]]
Former-commit-id: afed5f12a0
Former-commit-id: 18d9aa0dea483e977a5b69c7e4bd165908d70492 [formerly 61d6d42121 ]
Former-commit-id: e9aea7130e
|
2013-06-06 16:49:05 -05:00 |
|
Nate Jensen
|
ec2478d6e0
|
Merge "Issue #2023: Pure python client implementation of Data Access Framework." into development
Former-commit-id: a5164a148b [formerly 4c9e7eb885 ] [formerly cc7f3d9cf6 ] [formerly 78b33b57d1 [formerly cc7f3d9cf6 [formerly f5cc02c442077789e19bf615ec15a7b2e4195721]]]
Former-commit-id: 78b33b57d1
Former-commit-id: dcea5b11fca6a9d5d8aeb57b102e5f7bccf02e1c [formerly 479a15ab85 ]
Former-commit-id: 9ee84c0d97
|
2013-06-06 16:42:00 -05:00 |
|
Bryan Kowal
|
24e5e2a8ff
|
Issue #1927 - remove obsolete files
Former-commit-id: 844b1ed072 [formerly 6aecf2370f ] [formerly 6d642232dd ] [formerly 4962310360 [formerly 6d642232dd [formerly 00f7ba0212f84db3b36805e2dcc2790d67fcfaac]]]
Former-commit-id: 4962310360
Former-commit-id: 496dfd9d90da0c9a9e5d0f30aa352d85ec73818f [formerly fee1818521 ]
Former-commit-id: fa1add535d
|
2013-06-06 16:35:04 -05:00 |
|
Steve Harris
|
78f0921f63
|
Merge branch 'omaha_13.4.1' into development
Conflicts:
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java
Former-commit-id: a150d8b90b [formerly 64cf1aedb1 ] [formerly 571757b2a6 ] [formerly 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: bfd7bfea914d41fc958828fa95730a334190b2e1 [formerly 035d74b348 ]
Former-commit-id: 8b78f538d3
|
2013-06-06 15:46:23 -05:00 |
|
Steve Harris
|
a74c3b01ce
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c5f2c1abf1 [formerly b0c0e2e7cf ] [formerly 1e4c538e58 ] [formerly 56e04554e9 [formerly 1e4c538e58 [formerly 2e1e30df32ef00523dbcd995457b854cbcad3d41]]]
Former-commit-id: 56e04554e9
Former-commit-id: 584b35262b5cc8d99a405a60f609c90a554cca41 [formerly 72a559120f ]
Former-commit-id: 1d4e65d435
|
2013-06-06 15:43:34 -05:00 |
|
Bryan Kowal
|
11ce8abc78
|
Issue #1927 - build.properties standardization.
Former-commit-id: e6e6def97d [formerly 5d5b26a543 ] [formerly 0268fa48b0 ] [formerly a0e08f5bf7 [formerly 0268fa48b0 [formerly 6cc5a2bee443221c9585bbe75a2e87328088e340]]]
Former-commit-id: a0e08f5bf7
Former-commit-id: 9b7b5da92be842cbd48e7d3e84aa89ec3bafe8ed [formerly 6fff973f2d ]
Former-commit-id: 4e1d503b5e
|
2013-06-06 14:35:17 -05:00 |
|
Steve Harris
|
f7316ae4bd
|
13.4.1-14 baseline
Former-commit-id: ffcce90f3f [formerly be236eb722 ] [formerly c749e122eb ] [formerly 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7 ]
Former-commit-id: cebc1ddb63
|
2013-06-06 15:15:27 -04:00 |
|
David Gillingham
|
3dca4cce4c
|
Issue #2023: Pure python client implementation of Data Access Framework.
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427
Former-commit-id: 98b288f275 [formerly 2c0af328b6 ] [formerly ae3e7a64b0 ] [formerly 4bdf7178bd [formerly ae3e7a64b0 [formerly edc77397fb74f07c66dd9f7b9ede5e8af81b4b18]]]
Former-commit-id: 4bdf7178bd
Former-commit-id: 9db7659ae79bb9f296e845275e0f20ae041ad376 [formerly 3f4b44fbbc ]
Former-commit-id: 242d3a5493
|
2013-06-06 13:47:31 -05:00 |
|
Ben Steffensmeier
|
460410a87f
|
Issue #2041 fix python job coordinator shutdown.
Former-commit-id: e27f1d20d6 [formerly 955468866e ] [formerly 4bf7b44234 ] [formerly ab0bb800cb [formerly 4bf7b44234 [formerly c749e5f77e06ede7fa39ece6846d957b8edfaed2]]]
Former-commit-id: ab0bb800cb
Former-commit-id: 810a58a6800b9e624f27b19c3a48e73c8947a22a [formerly 8111840673 ]
Former-commit-id: b8cef5b733
|
2013-06-06 13:13:02 -05:00 |
|
Roger Ferrel
|
a51c2add11
|
Issue #1966 Working case generation without compression. Changes to Retention to remove compile errors.
Change-Id: I6ecfe7d9a4b352318b718849ba7e62b24254385d
Former-commit-id: 7664a92ad8 [formerly 147a321455 ] [formerly b645cd6079 ] [formerly 0737075420 [formerly b645cd6079 [formerly 43a4ee08b063e1e2aba5035b964cf0b93462885b]]]
Former-commit-id: 0737075420
Former-commit-id: 783ee3decdd28da73264b556535021a75f7ffdfd [formerly 47b72d3a5a ]
Former-commit-id: f5756aa417
|
2013-06-06 12:27:38 -05:00 |
|
Max Schenkelberg
|
0f72f90fa2
|
Issue #1638 Moved python localization project out of common.base feature to keep it minimal.
Amend: Added to wrong edex feature
Change-Id: Ic1f3bf92a4559ba04eb6a05c39d5773393235330
Former-commit-id: 04256b7548 [formerly 6afefe027b ] [formerly 0bfeed7240 ] [formerly 424ea84d6e [formerly 0bfeed7240 [formerly ac578db9a9809798c30d2c694bedb1d960395e77]]]
Former-commit-id: 424ea84d6e
Former-commit-id: f4bc575fd4f7424b96fd216a3ef955f3adc3b3f8 [formerly e80b104e15 ]
Former-commit-id: 1872fd5b67
|
2013-06-05 17:13:43 -05:00 |
|
David Gillingham
|
8ade43a3dc
|
Issue #2063: Improve performance of grid blanking in iscMosaic by only retrieving history data, not entire grid slices.
Change-Id: Icd25e7e54a391ca19445be866e411b35aed54b16
Former-commit-id: 5e53c3f0bd [formerly 51b317ac52 ] [formerly 9acf385f21 ] [formerly bad6a1fa40 [formerly 9acf385f21 [formerly 5570ee749c5797f8f2c9ab3f6f8392d2c5680d32]]]
Former-commit-id: bad6a1fa40
Former-commit-id: 71dde9577d001c57231eb1ddf6cca6a71e302a55 [formerly 070365714a ]
Former-commit-id: 5fe4739fc4
|
2013-06-05 16:26:04 -05:00 |
|
Dustin Johnson
|
37f5475d46
|
Merge "Issue #2064 - Add ability to subscribe to observational point data (MADIS)" into development
Former-commit-id: 7836105cff [formerly 6d589a3c79 ] [formerly 37791e95a1 ] [formerly 022346b4b3 [formerly 37791e95a1 [formerly 0fe4193763117516c900f4a0236706fd1b08a781]]]
Former-commit-id: 022346b4b3
Former-commit-id: a11103f22a06ee773f069a81e288acdaf952851e [formerly 3554d85245 ]
Former-commit-id: 4722edba19
|
2013-06-05 13:24:54 -05:00 |
|
Mike Duff
|
d9c8fa4f5c
|
Issue #2064 - Add ability to subscribe to observational point data (MADIS)
Change-Id: I298af2d50ec972ab4e728c7aa5d41c0a757d39fa
Former-commit-id: e6f8712306 [formerly 77611d7e9c ] [formerly 321209adb8 ] [formerly 12e5155edc [formerly 321209adb8 [formerly 9142ab024fb870b6c9fa18d42d42ae869c4ec58c]]]
Former-commit-id: 12e5155edc
Former-commit-id: ab2941e89c2d1b9a72ce27a9b74bec7f87fc7a12 [formerly 5e7ec92696 ]
Former-commit-id: 41f817e755
|
2013-06-05 12:06:58 -05:00 |
|
Richard Peter
|
65b21b5776
|
Merge "Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to." into development
Former-commit-id: a5de9a0b8f [formerly adfc741329 ] [formerly 27442499e6 ] [formerly e8c77bb251 [formerly 27442499e6 [formerly 5eb49ca9bf6a263af5059531b09cdb8a735ba9ac]]]
Former-commit-id: e8c77bb251
Former-commit-id: 64f387a6c3302df000419d4af8e8bbba8f9b9c19 [formerly 42777a98a8 ]
Former-commit-id: 33b799fb50
|
2013-06-05 11:48:09 -05:00 |
|
Nate Jensen
|
c5ed0f981a
|
Merge "Issue #2041 Improve exception handling for concurrent python. Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47" into development
Former-commit-id: fb7e8c6070 [formerly 38b028b665 ] [formerly 725adab244 ] [formerly 4bfba7d6c6 [formerly 725adab244 [formerly 3d70e1866b618991ed0f8decb4925c794222c7ad]]]
Former-commit-id: 4bfba7d6c6
Former-commit-id: 6fc65338458aaa9265fae7cd81c3267e87afe0a1 [formerly 07b1854308 ]
Former-commit-id: 64ccc2c283
|
2013-06-05 08:42:23 -05:00 |
|
Bryan Kowal
|
6c368db5e0
|
Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
Former-commit-id: b7b51697b8 [formerly 3427534c29 ] [formerly 4b5c653363 ] [formerly 2abb257d35 [formerly 4b5c653363 [formerly 289cd9fbe02da77b3c56729ec1ee4d3e89256a08]]]
Former-commit-id: 2abb257d35
Former-commit-id: 11d840385012f6641f89c0e54c9c442aed3c2d11 [formerly 98150aa493 ]
Former-commit-id: b3b85069ea
|
2013-06-04 18:25:58 -05:00 |
|
Ben Steffensmeier
|
05874a2376
|
Issue #2031 move grib splitting cleanup into a finally block so less tmp files leak.
Former-commit-id: 2370b4305c [formerly a01c4eb02b ] [formerly 2dc2e990cb ] [formerly 19af45e525 [formerly 2dc2e990cb [formerly 327fe058b08967d18fa83ac9e6fc9c3356d68ff2]]]
Former-commit-id: 19af45e525
Former-commit-id: 7f1e69827c61f66c1292d7cb055f2116de1b2d8f [formerly d773bbf625 ]
Former-commit-id: 016ed7211f
|
2013-06-04 18:23:06 -05:00 |
|
Ben Steffensmeier
|
4a98cb43a4
|
Issue #2041 Improve exception handling for concurrent python.
Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47
Former-commit-id: d9599eb3ae [formerly 5d5cd5e5f4 ] [formerly 8ce74c44df ] [formerly ef10b56e2b [formerly 8ce74c44df [formerly c605b0ce9b7437bfaa803b31c6f4b2f7dc17a6ea]]]
Former-commit-id: ef10b56e2b
Former-commit-id: 137f40ebc8428c8099afb92fc2a47d584a2c089d [formerly 0f70964bc9 ]
Former-commit-id: f78e0f18bf
|
2013-06-04 17:03:05 -05:00 |
|
Richard Peter
|
cbfbab7fb9
|
Merge "Issue #1965 Initial archive retention dialog work. updated archive creation, purge, and test cases after Roger's last checkin. added edex plugin for feature. added an abstract base archive dialog." into development
Former-commit-id: 96c8232006 [formerly 2281df8c5b ] [formerly e513fdbc3e ] [formerly 220e817e15 [formerly e513fdbc3e [formerly 1b5ab5d85b4f634357d0f52551b800378349b363]]]
Former-commit-id: 220e817e15
Former-commit-id: b87e95d2898e502766c05274499e1d042203b0c2 [formerly 6b75cad25f ]
Former-commit-id: b5cccf449d
|
2013-06-04 15:08:09 -05:00 |
|
Dustin Johnson
|
052d397cac
|
Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
Former-commit-id: c4446d26f1 [formerly a98b19c824 ] [formerly 3198277096 ] [formerly 37b7e400ea [formerly 3198277096 [formerly 9a3f2121defaaaefd8f6268e289f87ecb2ee3e78]]]
Former-commit-id: 37b7e400ea
Former-commit-id: 3c58657e60d5487cc0a3208db071bbf4465c4d6b [formerly b4a51bc24f ]
Former-commit-id: 533fb7139a
|
2013-06-04 14:22:59 -05:00 |
|
Benjamin Phillippe
|
8d03dd6c75
|
Issue #2022 Modifications to subscription last run time
and notificationservers
Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea
Former-commit-id: 5b9eecc8b8 [formerly 0862f2b7d3 ] [formerly f00d8ae721 ] [formerly 1cec0fab74 [formerly f00d8ae721 [formerly 4118d4e3888a5feb9bbc39036a8ceeb70d66e375]]]
Former-commit-id: 1cec0fab74
Former-commit-id: 3841592d2af8219265cb07e6457697758849bd51 [formerly 6e8314475e ]
Former-commit-id: 49ec0363c3
|
2013-06-04 14:19:09 -05:00 |
|
Richard Peter
|
a8780f26b5
|
Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java
Former-commit-id: c9c02248b3 [formerly f13177a981 ] [formerly 192e5b9be8 ] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad ]
Former-commit-id: 9c3fe01efa
|
2013-06-04 14:06:53 -05:00 |
|
Roger Ferrel
|
8820399134
|
Issue #1965 Initial archive retention dialog work.
updated archive creation, purge, and test cases after Roger's last checkin.
added edex plugin for feature.
added an abstract base archive dialog.
Change-Id: I7c9ca3df40a7591815a1aae4fabf660217d44574
Former-commit-id: ef974b52f0 [formerly dcc56ad5d3 ] [formerly b952eee030 ] [formerly f53d6bf4ff [formerly b952eee030 [formerly 64b75031afaecd74649392a19cc0b10dcdb79a2b]]]
Former-commit-id: f53d6bf4ff
Former-commit-id: 2833276d9329d4f1b9e5d852a18422d57355c145 [formerly 9aff5f2321 ]
Former-commit-id: 65d17722a9
|
2013-06-04 13:08:05 -05:00 |
|
Dustin Johnson
|
efce5e19d5
|
Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63
Former-commit-id: 57b3706e5d [formerly d81592b575 ] [formerly d47da65262 ] [formerly bc830e67f0 [formerly d47da65262 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]]
Former-commit-id: bc830e67f0
Former-commit-id: ec9fba7ab73ee52c73b56514e1ac66a6a8b5586e [formerly 0b710bc166 ]
Former-commit-id: cd1db53a35
|
2013-06-03 14:54:53 -05:00 |
|
Benjamin Phillippe
|
396102ea5d
|
Issue #1931 Fixed Repository Items REST Service
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97
Former-commit-id: 5450a58ca6 [formerly 2c147fe159 ] [formerly 1e413c68f6 ] [formerly a226f225fd [formerly 1e413c68f6 [formerly b2764126282aab128cc1465905c11686894ab1f7]]]
Former-commit-id: a226f225fd
Former-commit-id: 747180ba600bf97794019a0d0a919d238456940e [formerly 3b3ae2add0 ]
Former-commit-id: 97a9a6279b
|
2013-06-03 10:26:36 -05:00 |
|
Ron Anderson
|
9464771e25
|
Merge "Issue #1759: Add a more detailed comment in code for previous change." into omaha_13.4.1
Former-commit-id: 9e6969eccb [formerly d0897c31d8 ] [formerly fb5d432669 ] [formerly 0ae8346cfb [formerly fb5d432669 [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]]
Former-commit-id: 0ae8346cfb
Former-commit-id: 4227600ec53435b3c39496f85e74622ae01b7d76 [formerly f65ce6e3e6 ]
Former-commit-id: e6d7b83df5
|
2013-06-03 07:45:02 -05:00 |
|
Dave Hladky
|
beeaaab97b
|
Issue #2062 Fixed up AWIPS2_baseline portion of merge
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b
Former-commit-id: 87e81a8b1b [formerly 39f357570b ] [formerly 2f67b74318 ] [formerly fa8ea8ecca [formerly 2f67b74318 [formerly 982daef280be6f3efe87a066fa5919be9cfeb9ec]]]
Former-commit-id: fa8ea8ecca
Former-commit-id: d931c9ba679b7ae50fda63241a3da00faf83a9e9 [formerly 9d2ec44182 ]
Former-commit-id: 0317090ffd
|
2013-05-31 15:27:45 -05:00 |
|