Commit graph

2716 commits

Author SHA1 Message Date
Lee Venable
9a04cf8a77 Merge "Issue #1790 Changes for non-blocking CountyStateDlg." into development
Former-commit-id: f12dec046b [formerly cf1347c380] [formerly f12dec046b [formerly cf1347c380] [formerly 95b3e0dd4b [formerly 839e6d466d59e78d906380d742ea1999ff1115c0]]]
Former-commit-id: 95b3e0dd4b
Former-commit-id: dfc4f50b3a [formerly 8444e9ff54]
Former-commit-id: 39adf1bae0
2013-04-18 14:42:48 -05:00
Bryan Kowal
822094bc7c Issue #1899 - edex-environment is now compatible with qpid 0.18.
- added change history

Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646

Former-commit-id: 64d9276e2e [formerly 0924bfd726] [formerly 64d9276e2e [formerly 0924bfd726] [formerly 86d8e511b5 [formerly a38c6c2014c3252b740ba434b44d09adbebb9991]]]
Former-commit-id: 86d8e511b5
Former-commit-id: cf71d24fff [formerly ff64a23deb]
Former-commit-id: af1d6136e4
2013-04-18 14:06:53 -05:00
Dustin Johnson
f0e70659ec Merge "Issue #1914 Add email notification as a notification listener" into development
Former-commit-id: 1d906fecca [formerly b593a2581c] [formerly 1d906fecca [formerly b593a2581c] [formerly 4f60e45094 [formerly 1c6174bde3598fbe3b22aefb1c36a3a49968466b]]]
Former-commit-id: 4f60e45094
Former-commit-id: ef7be9524e [formerly 2c28b53ea4]
Former-commit-id: 1b83f30cdb
2013-04-18 13:25:57 -05:00
Dustin Johnson
e37b5f6fc0 Issue #1914 Add email notification as a notification listener
Amend: Fix broken test

Change-Id: I3b692255b5d84fffce174c0447970fe627f4a61e

Former-commit-id: f3d53eb889 [formerly 74a9b93d05] [formerly f3d53eb889 [formerly 74a9b93d05] [formerly 067b20c684 [formerly 45b5a9cffd6c57dc8ea1355ee623fcf6014dd377]]]
Former-commit-id: 067b20c684
Former-commit-id: 6ded48bcd8 [formerly 7b09a0e477]
Former-commit-id: cf29290348
2013-04-18 12:57:38 -05:00
Nate Jensen
3932b05a6e Merge "Issue #1916 fast rendering of CWAT Local Threat" into omaha_13.4.1
Former-commit-id: fde67ea9bb [formerly 2680043152] [formerly fde67ea9bb [formerly 2680043152] [formerly d7248a4dd5 [formerly bcc532d51f7b38da2f37ff943358b489a6d248fe]]]
Former-commit-id: d7248a4dd5
Former-commit-id: 068d35734a [formerly fe657596a7]
Former-commit-id: 2d8b398635
2013-04-18 12:42:27 -05:00
Dave Hladky
e6577edba9 Issue #1919 Fixed broken VGB processing
Change-Id: I4d0a1e3d2bdd13f474c33ded48620c740431719b

Former-commit-id: 179338b837 [formerly 30561c4d1b] [formerly 179338b837 [formerly 30561c4d1b] [formerly f682fe4482 [formerly d8b9e5d236f15145ff395dcbd3d741c931ef39f7]]]
Former-commit-id: f682fe4482
Former-commit-id: 89ae841190 [formerly 4ffbe250a8]
Former-commit-id: 773ced6623
2013-04-18 12:35:24 -05:00
Nate Jensen
0f8821fda4 Merge "Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project" into development
Former-commit-id: 27efccb414 [formerly 8f04f5329c] [formerly 27efccb414 [formerly 8f04f5329c] [formerly b8719b47c6 [formerly 2a198f5f3c8476888f2ea12679c1eb54f0b41c84]]]
Former-commit-id: b8719b47c6
Former-commit-id: 880776f544 [formerly ad10365a43]
Former-commit-id: 56b4132856
2013-04-18 12:31:39 -05:00
Nate Jensen
795c41543d Issue #1916 fast rendering of CWAT Local Threat
Change-Id: Ia8129ac6a81f35b1ed4aca19edfb21022cee2344

Former-commit-id: a1896e138e [formerly 91fbdd4ad1] [formerly a1896e138e [formerly 91fbdd4ad1] [formerly 74edcf7706 [formerly 66a036b90f75a844cbeed3eb1a483ccdc72ec11d]]]
Former-commit-id: 74edcf7706
Former-commit-id: 8b98d518c9 [formerly 22f54ab95e]
Former-commit-id: edb9a87c56
2013-04-18 12:19:36 -05:00
Ron Anderson
c11d94d88b Issue #1913 Fixed GFE level translation
Change-Id: I2e59228991243d4178c73721d169f695d6581b8a

Former-commit-id: fdb69afb73 [formerly 75f802d348] [formerly fdb69afb73 [formerly 75f802d348] [formerly 666263beb4 [formerly ed32dc366aae2fa64c02c9f32202aafb95845765]]]
Former-commit-id: 666263beb4
Former-commit-id: c21f5438be [formerly 214738a19e]
Former-commit-id: ae881d581b
2013-04-18 11:43:24 -05:00
Dustin Johnson
f38e3ba430 Merge "Issue #1914 Add plugin based registry notification" into development
Former-commit-id: af04ecf92b [formerly 1edba0cdc6] [formerly af04ecf92b [formerly 1edba0cdc6] [formerly 67eb771ccb [formerly 0b7539d488388f4f96af0ccf97f5651c8e7d8259]]]
Former-commit-id: 67eb771ccb
Former-commit-id: 912cc39887 [formerly 375221e524]
Former-commit-id: 48bd9cad66
2013-04-18 11:00:57 -05:00
Benjamin Phillippe
82fbc777dc Issue #1905 Implemented registry notifications via email
Change-Id: I2753074c302d707066ac0de42ac5b0778049275d

Former-commit-id: a44a4b69ff [formerly a525a1430c] [formerly a44a4b69ff [formerly a525a1430c] [formerly 7e6b8eedca [formerly e8dba1178491176da3543a46c0d543c489b5fcb1]]]
Former-commit-id: 7e6b8eedca
Former-commit-id: f38475de7d [formerly 9742cc996f]
Former-commit-id: 26a762690a
2013-04-18 10:19:12 -05:00
Nate Jensen
87555a8dae Merge "Issue #1916 overrode getDataTimes() to boost efficiency" into omaha_13.4.1
Former-commit-id: 45ad0cbb85 [formerly 0de50ae786] [formerly 45ad0cbb85 [formerly 0de50ae786] [formerly 7562ac5edc [formerly ec6edaaad3943caf55f97e8f7fd9974086e3b360]]]
Former-commit-id: 7562ac5edc
Former-commit-id: c79c2ce16e [formerly 25dfadb872]
Former-commit-id: bd1913e040
2013-04-18 10:15:57 -05:00
Roger Ferrel
85d2de0c8f Issue #1790 Changes for non-blocking CountyStateDlg.
Change-Id: I101202dbe8f5c1fdd9bac9b86a629960d9681e7d

Former-commit-id: 44bb7ab00d [formerly 910adae4ee] [formerly 44bb7ab00d [formerly 910adae4ee] [formerly 9c428385ee [formerly a1b5f0b08a08bed1b76f81094970594aeae0a1f3]]]
Former-commit-id: 9c428385ee
Former-commit-id: 09a615a7c1 [formerly 04cd4f7f37]
Former-commit-id: e4e92dfa8d
2013-04-18 07:49:08 -05:00
Ben Steffensmeier
dc914ac07c Issue #1912 Initial bulk hdf5 access for ffmp
Change-Id: If2b9afbd23d0388c16f05ddaaf47a1ac8dc6b339

Former-commit-id: 7a5835a43a [formerly 4db55d9a58] [formerly 7a5835a43a [formerly 4db55d9a58] [formerly fada8ae7dd [formerly 972ca525d04ca13eb43816bdfeb9bf4fb4786d76]]]
Former-commit-id: fada8ae7dd
Former-commit-id: 09c34a3eae [formerly 84ee23cc58]
Former-commit-id: 9582c84385
2013-04-17 16:35:50 -05:00
Nate Jensen
93868c334c Issue #1916 overrode getDataTimes() to boost efficiency
Change-Id: Ic9b3c6ddd2885f3fdef56910cb1e829387d48872

Former-commit-id: df2823edea [formerly 834d36e1a9] [formerly df2823edea [formerly 834d36e1a9] [formerly f2b383d4d6 [formerly cd6133708f29ea162ae3fe5456a2d8463e60dce3]]]
Former-commit-id: f2b383d4d6
Former-commit-id: d4273c8b41 [formerly 181b717cf2]
Former-commit-id: 245fcec165
2013-04-17 16:21:20 -05:00
Dustin Johnson
cc23ed1760 Merge "Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up. Peer review comments" into omaha_13.4.1
Former-commit-id: eb096536b3 [formerly c2cdafa265] [formerly eb096536b3 [formerly c2cdafa265] [formerly f6a63050a1 [formerly 4adb0045f3a22d9b07e2cca5630feebc78981492]]]
Former-commit-id: f6a63050a1
Former-commit-id: c6c0e2cd5a [formerly f2e4d0c743]
Former-commit-id: b526eaadc8
2013-04-17 13:03:16 -05:00
Richard Peter
3e427dc3c4 Merge "Issue #1868 Rewrite mergeAll in PluginDao Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d" into omaha_13.4.1
Former-commit-id: 98021fc2be [formerly c35d7575dc] [formerly 98021fc2be [formerly c35d7575dc] [formerly ad5757729f [formerly 636d54e9ac473d59a8293ade9814161ec06e6b50]]]
Former-commit-id: ad5757729f
Former-commit-id: c534c9eb36 [formerly 35db65a6c1]
Former-commit-id: bd3d8d0a85
2013-04-17 12:46:02 -05:00
Dustin Johnson
e589ca5e12 Issue #1914 Add plugin based registry notification
Change-Id: Ie450b60683e4c317ac19628cb923310b828747a7

Former-commit-id: dd190be390 [formerly 91fe9ea501] [formerly dd190be390 [formerly 91fe9ea501] [formerly 8989c09566 [formerly c75a5f6664b3c6d79773f4eda52ce03dfb5ba877]]]
Former-commit-id: 8989c09566
Former-commit-id: 1ea04e20e0 [formerly 0e1994a03c]
Former-commit-id: 0bf75efca4
2013-04-17 12:17:23 -05:00
Greg Armendariz
9a6d08ab4b Merge "Issue #1835 - update LDM to 6.11.2" into omaha_13.4.1
Former-commit-id: f87951189b [formerly 18a660f406] [formerly f87951189b [formerly 18a660f406] [formerly e67819dbdc [formerly a7a457820a74b1d9810b7e4112ede8885d5c7905]]]
Former-commit-id: e67819dbdc
Former-commit-id: 6e4fddd6c6 [formerly 2af1a197aa]
Former-commit-id: 99b9ef5719
2013-04-17 12:03:22 -05:00
Ben Steffensmeier
f7adb5a99d Issue #1868 Rewrite mergeAll in PluginDao
Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d

Former-commit-id: d21778dbfb [formerly 7dc1e34f1b] [formerly d21778dbfb [formerly 7dc1e34f1b] [formerly 3e83b37afd [formerly 93a4bc3f6e7ae7de959a25a563778f424d53f2d1]]]
Former-commit-id: 3e83b37afd
Former-commit-id: 0be0b444e4 [formerly bf72ff3d37]
Former-commit-id: 5779912e87
2013-04-17 11:58:41 -05:00
Max Schenkelberg
eb6a0d25d0 Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project
Amend: Removed eclipse feature all together, added os and arch to fragments.  Ensured unpack flag stayed same when changing features.

Change-Id: I78a2c5262ebdbe3ace3c180254b5f036011c0a65

Former-commit-id: 6ccef4d3c7 [formerly bd52681be3] [formerly 6ccef4d3c7 [formerly bd52681be3] [formerly 7513e5982b [formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]]
Former-commit-id: 7513e5982b
Former-commit-id: 1950aff01a [formerly 57f34e9080]
Former-commit-id: 2e5c1a7c32
2013-04-17 11:42:46 -05:00
Mike Duff
9ff19270a5 Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up.
Peer review comments

Change-Id: Idf195398fdfcf7f52abf0ce203b048c3ac1186cb

Former-commit-id: 0935bc3e30 [formerly 1f80f38e8a] [formerly 0935bc3e30 [formerly 1f80f38e8a] [formerly 866e27825f [formerly dbdfc33769f7b179f9f4a3a2a2f9d509facb78d8]]]
Former-commit-id: 866e27825f
Former-commit-id: e1e3449c71 [formerly 17d3ed8fde]
Former-commit-id: 61c9dde6d0
2013-04-17 10:48:25 -05:00
Roger Ferrel
782ae7695f Issue #1790 Changes for non-blocking ArealDefinitionsDlg, CoopAgencyOfficeDlg, CopyNewLocationDlg and BenchmarkDlg.
Change-Id: Ie4b0cbe02f0ba74ec6678acb20c9d085b08a4cea

Former-commit-id: be06f98b17 [formerly 3f79090c6b] [formerly be06f98b17 [formerly 3f79090c6b] [formerly 5d23b6a450 [formerly f3eb94989b149efb8651f37d2171615829eabf9d]]]
Former-commit-id: 5d23b6a450
Former-commit-id: 985d27c132 [formerly 96e603043a]
Former-commit-id: 5eeaecd8a1
2013-04-17 10:43:32 -05:00
Richard Peter
37ac8759d5 Merge "Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes." into omaha_13.4.1
Former-commit-id: 61c22f6715 [formerly 577c9c144d] [formerly 61c22f6715 [formerly 577c9c144d] [formerly 5b1df2ba1a [formerly 81a40e8324f38f819039d179889b4b7c016d3dfe]]]
Former-commit-id: 5b1df2ba1a
Former-commit-id: a4bbf3c07a [formerly c614e29a9c]
Former-commit-id: 8641f8617a
2013-04-17 09:33:06 -05:00
Bryan Kowal
69c1d4c465 Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
Former-commit-id: 3ac089fbf8 [formerly 0a92ecca56] [formerly 3ac089fbf8 [formerly 0a92ecca56] [formerly a2cd90e16a [formerly 43f7cd079a103ad11d21a903438aac5736d88654]]]
Former-commit-id: a2cd90e16a
Former-commit-id: 2f4b108057 [formerly 74ba9ebc3f]
Former-commit-id: 15af31e90f
2013-04-16 17:01:45 -05:00
Roger Ferrel
f271510075 Issue #1790 Changes for non-blocking AdministrationDlg.
Change-Id: Iec8d71c747ef5167cd49909caba33176519cd07d

Former-commit-id: f24bd5d02b [formerly e8093a3a56] [formerly f24bd5d02b [formerly e8093a3a56] [formerly 0194324742 [formerly aa671a4bcfbd26ade407a8e52c6fe5eac69eb83f]]]
Former-commit-id: 0194324742
Former-commit-id: 66ffbeb3a6 [formerly f3da79e406]
Former-commit-id: 5766931c23
2013-04-16 16:34:00 -05:00
Bryan Kowal
8cc6de9e57 Issue #1835 - update LDM to 6.11.2
- fixed hard-coded 6.8.1 version

Change-Id: Id201ea8703dd67e3b7aaadd9787fa97be2da8890

Former-commit-id: dfd75571f3 [formerly 890a6c0afb] [formerly dfd75571f3 [formerly 890a6c0afb] [formerly ba3a0ad7d5 [formerly 72ffc3204a1fa40fe2ae17801013cb93cd2961b8]]]
Former-commit-id: ba3a0ad7d5
Former-commit-id: fc4e0af835 [formerly 6ef61185c9]
Former-commit-id: 77242640b8
2013-04-16 16:32:58 -05:00
Roger Ferrel
83fa6e1bf5 Issue #1790 Changes for non-blocking AddModifyLocationDlg.
Change-Id: Ice2d3a8bbeaff0689d2b4e0a2ba8bbee017fb080

Former-commit-id: 2d6c308083 [formerly 3c42ad8145] [formerly 2d6c308083 [formerly 3c42ad8145] [formerly f410ee5f89 [formerly 8e78b6799404059032f10b97e62d385e07852c53]]]
Former-commit-id: f410ee5f89
Former-commit-id: 9c8faa3b5b [formerly f576747b38]
Former-commit-id: cca9aca98b
2013-04-16 15:54:02 -05:00
Brad Gonzales
4a086703ea Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
       added sequence delta script.

Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1

Former-commit-id: 005c935be6 [formerly dc37712fda] [formerly 005c935be6 [formerly dc37712fda] [formerly b75ef08190 [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]]
Former-commit-id: b75ef08190
Former-commit-id: a21b495206 [formerly 16f030294d]
Former-commit-id: 00c0f59b6b
2013-04-16 14:44:06 -05:00
Roger Ferrel
4a70d016bf Issue #1790 Changes for non-blocking ForecastAttributeDlg.
Change-Id: I3724d165f721f9664f69ede09864a9714e35405b

Former-commit-id: ad47a959f4 [formerly 2b2dabdc71] [formerly ad47a959f4 [formerly 2b2dabdc71] [formerly c1b7b2e3bd [formerly f4d3fdda15d34a454887c9a14b6deada7a698141]]]
Former-commit-id: c1b7b2e3bd
Former-commit-id: 6d6eb9b7c3 [formerly 1f0b994b9a]
Former-commit-id: 30dd322db4
2013-04-16 14:44:03 -05:00
Mike Duff
6cbaa20526 Issue #1786 - fix null pointer
Change-Id: Ie7bf3aa9afe6a8dcd9d288afc0e6dc537fdf043d

Former-commit-id: ad08e0a6ac [formerly 6b909c7902] [formerly ad08e0a6ac [formerly 6b909c7902] [formerly 7701902083 [formerly 6f14dfd04a696c71e2b2c9d12b86549287e7f0de]]]
Former-commit-id: 7701902083
Former-commit-id: 69dd972313 [formerly 53c87a865c]
Former-commit-id: 4c9edcec56
2013-04-16 14:21:28 -05:00
Roger Ferrel
ae72f407b0 Issue #1790 Changes for non-blocking StationReportingStatusDlg.
Change-Id: Icd11c338c2bc7399c10205d10d3c11ff034d61d7

Former-commit-id: aa11977fd3 [formerly 1ba7a11037] [formerly aa11977fd3 [formerly 1ba7a11037] [formerly af0aa091f3 [formerly ec789fc71009b77d6f44b7eba606ba5259d253a8]]]
Former-commit-id: af0aa091f3
Former-commit-id: b49ab42ce1 [formerly 2020d82599]
Former-commit-id: c1e1f3786f
2013-04-16 12:51:18 -05:00
Dustin Johnson
ea37022631 Issue #1910 Add some tests of the LifecycleManager SubmitObjects functionality
Change-Id: Ieb1544cb52cf108836b157e3d800c470fa5cf3e1

Former-commit-id: 67e49201d6 [formerly 255aea053b] [formerly 67e49201d6 [formerly 255aea053b] [formerly 58b6899672 [formerly c4344f5402fe33e7e47515adc3b54913f9c13617]]]
Former-commit-id: 58b6899672
Former-commit-id: ce9f5a7365 [formerly cb899b3fa0]
Former-commit-id: 522549fc3a
2013-04-16 11:30:06 -05:00
Dustin Johnson
ff9f489fea Issue #1906 Remove new registry plugin from datadelivery feature
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598

Former-commit-id: e44d3a8715 [formerly c8241840c5] [formerly e44d3a8715 [formerly c8241840c5] [formerly 977702e876 [formerly 71b4bb07870f5490d89a1fe657429444c54a2689]]]
Former-commit-id: 977702e876
Former-commit-id: ee0572026a [formerly 8170693941]
Former-commit-id: 8095deee57
2013-04-16 10:36:56 -05:00
Richard Peter
e4c7161748 Merge "Issue #1787 Fixed to support changes to D2D grid location" into omaha_13.4.1
Former-commit-id: 30e77171ab [formerly 390bf03c39] [formerly 30e77171ab [formerly 390bf03c39] [formerly 5a11d3cc1c [formerly 73e3a04a98ced3670c61b5debacdfc79d494ab29]]]
Former-commit-id: 5a11d3cc1c
Former-commit-id: 4ed90bf67a [formerly 6be394ba64]
Former-commit-id: d2354e13ec
2013-04-16 09:35:12 -05:00
Dustin Johnson
493f6d3aa5 Issue #1906 Remove use of hibernate columnDefinition from SubscriptionType
Change-Id: I310914180865ca65290c48dc1c55f9dc11f3c044

Former-commit-id: 3e5ace2cf3 [formerly 391a7bb999] [formerly 3e5ace2cf3 [formerly 391a7bb999] [formerly 8b38dec4bb [formerly 67ff37feac0998378a30c09894fab7ea0dbd84f8]]]
Former-commit-id: 8b38dec4bb
Former-commit-id: 395e4db621 [formerly 80ff75c473]
Former-commit-id: 6302ad04b4
2013-04-16 08:08:47 -05:00
Ron Anderson
4dd37ae7cd Issue #1787 Fixed to support changes to D2D grid location
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c

Former-commit-id: 4ea01a29ce [formerly c233ce042d] [formerly 4ea01a29ce [formerly c233ce042d] [formerly 4cd87f2726 [formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]]
Former-commit-id: 4cd87f2726
Former-commit-id: 24a6a3590f [formerly e9f674a575]
Former-commit-id: 89a2d99bfe
2013-04-15 18:02:47 -05:00
Dave Hladky
14a08d6f66 Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8

Former-commit-id: c52445652a [formerly 60fa768195] [formerly c52445652a [formerly 60fa768195] [formerly 978e68d893 [formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]
Former-commit-id: 978e68d893
Former-commit-id: d0ec4f0d87 [formerly 5789936212]
Former-commit-id: 0f7843f0b7
2013-04-15 17:58:06 -05:00
Bryan Kowal
6ad82744d2 Issue #1814 - use the AWIPS II log4j.xml for qpid
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1

Former-commit-id: e720bf74b5 [formerly e00a6207a5] [formerly e720bf74b5 [formerly e00a6207a5] [formerly 35b956fc4c [formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]]
Former-commit-id: 35b956fc4c
Former-commit-id: 49b9046bb4 [formerly cbc2742070]
Former-commit-id: 39bae3cc54
2013-04-15 16:38:00 -05:00
Lee Venable
783df0394c Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
Former-commit-id: 9ae56e2172 [formerly 8723d88a19] [formerly 9ae56e2172 [formerly 8723d88a19] [formerly 8c8709f4a6 [formerly 042819679ba8e0d22695b41059772da841619f29]]]
Former-commit-id: 8c8709f4a6
Former-commit-id: b18fa4f6bf [formerly 1674a59ed3]
Former-commit-id: ec3f0c0a11
2013-04-15 15:33:53 -05:00
Nate Jensen
f8c3cb4589 Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development
Former-commit-id: 56c1fe7422 [formerly 0cbf561f7c] [formerly 56c1fe7422 [formerly 0cbf561f7c] [formerly d411aad285 [formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]]
Former-commit-id: d411aad285
Former-commit-id: d785d3f1c2 [formerly 9d0e3fd0c2]
Former-commit-id: 2eaf49612c
2013-04-15 14:57:03 -05:00
Matt Nash
a8358a4b40 Issue #1870 add package-info.java so that the empty src directory gets pushed to git
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840

Former-commit-id: 7ffb45758d [formerly 0d12fb16bc] [formerly 7ffb45758d [formerly 0d12fb16bc] [formerly 4b896002ac [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]]
Former-commit-id: 4b896002ac
Former-commit-id: 317cbf0950 [formerly 87af6d2809]
Former-commit-id: a2e421048c
2013-04-15 14:53:07 -05:00
Lee Venable
71870d782c Merge "Issue #1904 - FFMPConfig no longer able to be reset." into development
Former-commit-id: 966085d878 [formerly c5c885b28b] [formerly 966085d878 [formerly c5c885b28b] [formerly 770f473bf7 [formerly 72178a388b7114f92146ba7fbb1eb062cbeb7aa4]]]
Former-commit-id: 770f473bf7
Former-commit-id: 42aefd0d77 [formerly 668a5133f6]
Former-commit-id: e1c360ca37
2013-04-15 13:11:34 -05:00
Mike Duff
00b3600ad6 Issue #1904 - FFMPConfig no longer able to be reset.
Change-Id: I9e7a7628ca1cd77964574fbc84c2cd2f78364872

Former-commit-id: 2323505f91 [formerly 18e5561dd2] [formerly 2323505f91 [formerly 18e5561dd2] [formerly f9c0de442f [formerly 5775e40e5f939ca847527ae562cba71dc3984a60]]]
Former-commit-id: f9c0de442f
Former-commit-id: b847733566 [formerly c0f6fe5199]
Former-commit-id: 5253e6e535
2013-04-15 13:02:58 -05:00
Richard Peter
ec77d423fe Issue #1814: Change baseline memory configuration and baseline default log configuration
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3

Former-commit-id: c10d2f7520 [formerly 0c869ee231] [formerly c10d2f7520 [formerly 0c869ee231] [formerly 78b230aaaf [formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]
Former-commit-id: 78b230aaaf
Former-commit-id: a281d26608 [formerly d967301cfc]
Former-commit-id: 4e9789f56d
2013-04-15 12:52:40 -05:00
Dustin Johnson
e5c79edc53 Merge "Issue #1802 Implemented ebxml registry replication" into development
Former-commit-id: 20ee731e62 [formerly 4276b4efa1] [formerly 20ee731e62 [formerly 4276b4efa1] [formerly 52095664e0 [formerly 51fea5de5df2ff5ad2169614fb6f4d64ea586c6b]]]
Former-commit-id: 52095664e0
Former-commit-id: 7268795739 [formerly fdf0f29feb]
Former-commit-id: a66aceef23
2013-04-15 12:42:23 -05:00
Bryan Kowal
7db0542069 Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
Former-commit-id: 0800c14061 [formerly cca3f43736] [formerly 0800c14061 [formerly cca3f43736] [formerly c797715efe [formerly d0fe712b37f7890c547470b24139635183ee9e1e]]]
Former-commit-id: c797715efe
Former-commit-id: 8e27924557 [formerly 671e600a62]
Former-commit-id: fa59505e28
2013-04-15 09:40:43 -05:00
Mike Duff
feb9fc93ef Issue #1902 - FFMP permormance/cleanup
peer review comments

Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15

Former-commit-id: 8271eaf328 [formerly 020713663a] [formerly 8271eaf328 [formerly 020713663a] [formerly 85f1aba297 [formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]
Former-commit-id: 85f1aba297
Former-commit-id: 7a1809afca [formerly f61bae1c3e]
Former-commit-id: 812599d8db
2013-04-15 09:40:07 -05:00
Steve Harris
b446c96698 Merge branch 'master_13.3.1' into omaha_13.4.1
Former-commit-id: 97790b0d3e [formerly 6dc19411c1] [formerly 97790b0d3e [formerly 6dc19411c1] [formerly bdefa9f20f [formerly cb0c44c44331d64e566905a166abf132f6a5817b]]]
Former-commit-id: bdefa9f20f
Former-commit-id: a6ccaf52d4 [formerly 85bebd026e]
Former-commit-id: 7144ec32e9
2013-04-15 09:37:29 -05:00
Steve Harris
7dbffd78a1 Merge branch 'master_13.3.1' into master_13.4.1
Former-commit-id: 035878a846 [formerly 7957c52dec] [formerly 035878a846 [formerly 7957c52dec] [formerly e6d37f3e6d [formerly 59bd064351a843fd514514de9dc942d13c6d7793]]]
Former-commit-id: e6d37f3e6d
Former-commit-id: e11088fefd [formerly ad51361408]
Former-commit-id: 01dfc19f60
2013-04-15 09:34:45 -05:00