Bryan Kowal
6032a8dd0c
Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
...
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6
Former-commit-id: c448651065
[formerly 03a2e82b77
] [formerly c448651065
[formerly 03a2e82b77
] [formerly 8d3c98eb5d
[formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 12e9b9d75b
[formerly 5816ddaf77
]
Former-commit-id: bd47c62789
2013-04-03 18:27:10 -05:00
Nate Jensen
b151421989
Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
...
Former-commit-id: f43ac8bbc3
[formerly 79a9d76915
] [formerly f43ac8bbc3
[formerly 79a9d76915
] [formerly 73d86e8926
[formerly eaabe1a4935051d003ed302de193cfb183118845]]]
Former-commit-id: 73d86e8926
Former-commit-id: e74f83d83a
[formerly c87d157cbd
]
Former-commit-id: 5be8ef079e
2013-04-03 17:28:49 -05:00
Roger Ferrel
2cad51c18f
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
...
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: f8d1a13c38
[formerly 54cbf656e9
] [formerly f8d1a13c38
[formerly 54cbf656e9
] [formerly d2aae617b2
[formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]
Former-commit-id: d2aae617b2
Former-commit-id: 2b4b10d643
[formerly 7b829a2fec
]
Former-commit-id: ad658b46bf
2013-04-03 12:48:18 -05:00
Ben Steffensmeier
eb98e23be1
Issue #1824 Fix Tile Geometry creation.
...
Former-commit-id: fe561d7af0
[formerly fedbc28588
] [formerly fe561d7af0
[formerly fedbc28588
] [formerly cfcc33cd7b
[formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]]
Former-commit-id: cfcc33cd7b
Former-commit-id: e0bbe368be
[formerly 58d81f6556
]
Former-commit-id: 15be152be1
2013-04-03 10:59:11 -05:00
Nate Jensen
e0cb68cc06
Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
...
Former-commit-id: ab28523a09
[formerly f57358cff8
] [formerly ab28523a09
[formerly f57358cff8
] [formerly 8f9ec8dd2c
[formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 1ad5bb1a52
[formerly 374eed35b3
]
Former-commit-id: d1f53fb57e
2013-04-02 14:29:15 -05:00
Bryan Kowal
3f9bcfe936
Issue #1850 - the ebxml schema will now be created within the metadata database
...
Former-commit-id: d6e3d52126
[formerly 8d63244b4e
] [formerly d6e3d52126
[formerly 8d63244b4e
] [formerly 2dbd62e9ce
[formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]]
Former-commit-id: 2dbd62e9ce
Former-commit-id: a57a457c79
[formerly b31ade0770
]
Former-commit-id: 94b0191843
2013-04-02 10:49:46 -05:00
Dustin Johnson
e57b8314d8
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
...
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: 48a2002e68
[formerly c981b7250f
] [formerly 48a2002e68
[formerly c981b7250f
] [formerly 6129d86be4
[formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]
Former-commit-id: 6129d86be4
Former-commit-id: 644ed2396d
[formerly dd8f4d8454
]
Former-commit-id: 15ed8a6f58
2013-04-01 15:35:51 -05:00
Max Schenkelberg
ee60a2a80c
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: 9d032f3e84
[formerly b32fbad9c8
] [formerly 9d032f3e84
[formerly b32fbad9c8
] [formerly 547190329b
[formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]
Former-commit-id: 547190329b
Former-commit-id: ba262e2bc5
[formerly 635388a7ad
]
Former-commit-id: 80b0f7c159
2013-04-01 12:41:50 -05:00
Lee Venable
ca38aca6df
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
...
Former-commit-id: e994040887
[formerly 4a8c4b64df
] [formerly e994040887
[formerly 4a8c4b64df
] [formerly f1e8faf9ff
[formerly 9c117d43e77ffa074c8464771918116f8835b382]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 58c83b9662
[formerly 35d27f89f1
]
Former-commit-id: e66a72fbed
2013-04-01 12:26:23 -05:00
Steve Harris
ac6704c7e9
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 736bb45741
[formerly 140765a43e
] [formerly 736bb45741
[formerly 140765a43e
] [formerly 437a04011a
[formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]
Former-commit-id: 437a04011a
Former-commit-id: 7b27767d7e
[formerly 0b48e96314
]
Former-commit-id: d0e61c59e8
2013-04-01 12:19:04 -05:00
Steve Harris
e74f4ae39e
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: 3b722f1076
[formerly 74a47b9bd9
] [formerly 3b722f1076
[formerly 74a47b9bd9
] [formerly 14c9de2259
[formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: f85a1ab9ab
[formerly a6dd28cc82
]
Former-commit-id: 0fee31b1a8
2013-04-01 12:15:04 -05:00
Lee Venable
631444f8fa
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
...
Former-commit-id: 7d73b8dacf
[formerly fe89cb7fe4
] [formerly 7d73b8dacf
[formerly fe89cb7fe4
] [formerly d3390596f4
[formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]
Former-commit-id: d3390596f4
Former-commit-id: 4e95ffe2ae
[formerly 89da26a266
]
Former-commit-id: e0d1017c14
2013-04-01 12:06:16 -05:00
Steve Harris
a112803c98
13.3.1-17 baseline
...
Former-commit-id: f28b85d42f
[formerly 7bf9966dcb
] [formerly f28b85d42f
[formerly 7bf9966dcb
] [formerly a3fe998f8f
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7
[formerly 4afa41d4e7
]
Former-commit-id: 50becef97f
2013-04-01 12:04:56 -05:00
Steve Harris
e61c718b49
13.3.1-16 baseline
...
Former-commit-id: a262f22cee
[formerly 51380726d4
] [formerly a262f22cee
[formerly 51380726d4
] [formerly 3066dd33e5
[formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 6b75202d07
[formerly 36a4b3eb51
]
Former-commit-id: c53a305b1e
2013-04-01 11:39:08 -05:00
Mike Duff
e07f3971c0
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: fa8ca827d1
[formerly 261a39122d
] [formerly fa8ca827d1
[formerly 261a39122d
] [formerly 9c2ac87482
[formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]
Former-commit-id: 9c2ac87482
Former-commit-id: e627279d7c
[formerly 11ca7c2c20
]
Former-commit-id: 63489a0873
2013-04-01 11:36:53 -05:00
Richard Peter
1b229e3d61
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
...
Former-commit-id: 2fa88522ff
[formerly e221223f8a
] [formerly 2fa88522ff
[formerly e221223f8a
] [formerly 255617199c
[formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]
Former-commit-id: 255617199c
Former-commit-id: 65f317e56b
[formerly ea4a599a5a
]
Former-commit-id: 58a8049b64
2013-04-01 11:33:59 -05:00
Steve Harris
cc1ef45545
13.3.1-15 baseline
...
Former-commit-id: 4cf3ad6abb
[formerly eb1dab3864
] [formerly 4cf3ad6abb
[formerly eb1dab3864
] [formerly 3d8ed484be
[formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2bf790aae3
[formerly d3cec5d3cb
]
Former-commit-id: 4204273f21
2013-04-01 11:33:20 -05:00
Max Schenkelberg
a29eff544b
Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
...
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments
Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835
Former-commit-id: a508e9c8cb
[formerly 321a29ffa4
] [formerly a508e9c8cb
[formerly 321a29ffa4
] [formerly 51d976e5e2
[formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]
Former-commit-id: 51d976e5e2
Former-commit-id: 8de3a70962
[formerly 1c35a54a9f
]
Former-commit-id: 01c2d29c1b
2013-04-01 10:19:36 -05:00
Lee Venable
0a5a8d108a
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
...
Former-commit-id: 7389bf5b29
[formerly 2875600910
] [formerly 7389bf5b29
[formerly 2875600910
] [formerly 0bfc05ce61
[formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: ebfa8ea79c
[formerly 3d683e98a9
]
Former-commit-id: 034e16baa7
2013-04-01 09:40:59 -05:00
Roger Ferrel
c95d8692ff
Issue #1790 Changes for non-blocking StationProfileDlg.
...
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: e1b40f9f2f
[formerly 0d269691e2
] [formerly e1b40f9f2f
[formerly 0d269691e2
] [formerly d21cb5e2e8
[formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]]
Former-commit-id: d21cb5e2e8
Former-commit-id: 86e21acae2
[formerly 944d03615e
]
Former-commit-id: 9e3bee6562
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
facdfdc501
Issue #1799 fix modal tools again.
...
Former-commit-id: cffac354e8
[formerly eeeede7288
] [formerly cffac354e8
[formerly eeeede7288
] [formerly 66af8daa11
[formerly c1a69f88df85478571394c0e125617c93100168d]]]
Former-commit-id: 66af8daa11
Former-commit-id: 11e6afa5fa
[formerly 7082466303
]
Former-commit-id: b3245f7a5d
2013-03-29 14:30:54 -05:00
Roger Ferrel
3a3e3674a8
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 281e7f53cb
[formerly c5a95dcb44
] [formerly 281e7f53cb
[formerly c5a95dcb44
] [formerly 6ad80607bc
[formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]
Former-commit-id: 6ad80607bc
Former-commit-id: ba0060522f
[formerly de02460b11
]
Former-commit-id: 99ebeac6fd
2013-03-29 13:46:51 -05:00
Roger Ferrel
791fbba888
Issue #1790 Last of the bug fixes. Reviewer changes
...
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 20f6baba0e
[formerly 8f4492c63c
] [formerly 20f6baba0e
[formerly 8f4492c63c
] [formerly 463407a40e
[formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]
Former-commit-id: 463407a40e
Former-commit-id: 8c1116eaae
[formerly ec5f32aec6
]
Former-commit-id: c1ffc82920
2013-03-29 11:35:08 -05:00
Ron Anderson
8502dee456
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
...
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: 4ac9a4d9a8
[formerly 0f4fb125b0
] [formerly 4ac9a4d9a8
[formerly 0f4fb125b0
] [formerly c7cfcf0250
[formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]
Former-commit-id: c7cfcf0250
Former-commit-id: cd0f319ec5
[formerly 9cfa87f7e5
]
Former-commit-id: 41b0758084
2013-03-29 10:48:26 -05:00
Ron Anderson
1eede44aac
Issue #1774 Fix invalid unit strings in parameterInfo files.
...
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: cfb324f380
[formerly aeb451a37c
] [formerly cfb324f380
[formerly aeb451a37c
] [formerly 679bb01764
[formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]
Former-commit-id: 679bb01764
Former-commit-id: d5e3976dc4
[formerly 96e8f63679
]
Former-commit-id: 22f633b2a1
2013-03-29 10:07:37 -05:00
Greg Armendariz
9a8ce1af9e
Fix merge issue
...
Former-commit-id: 611661ccc9
[formerly cd5da3a6c5
] [formerly 611661ccc9
[formerly cd5da3a6c5
] [formerly 5da06cadd7
[formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]
Former-commit-id: 5da06cadd7
Former-commit-id: dcd36e64a6
[formerly f0e1b80cd2
]
Former-commit-id: 57eff9d7bf
2013-03-29 09:52:46 -05:00
Greg Armendariz
63d746dd77
Change package location of import
...
Former-commit-id: f778112c20
[formerly d533c5c08d
] [formerly f778112c20
[formerly d533c5c08d
] [formerly 27345f6edf
[formerly c158a7540d23451b864a1464ab64882c3d45386d]]]
Former-commit-id: 27345f6edf
Former-commit-id: 05af592718
[formerly 089dfc87e6
]
Former-commit-id: 87e37c990e
2013-03-29 09:09:32 -05:00
David Gillingham
4c1c4e665e
Issue #1837 : Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
...
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0
Former-commit-id: 170f252bdd
[formerly 8a7c965eaa
] [formerly 170f252bdd
[formerly 8a7c965eaa
] [formerly c9ed59b0e0
[formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: fddd42615d
[formerly dbec0fa00f
]
Former-commit-id: 0b155a5788
2013-03-28 17:18:43 -05:00
Nate Jensen
1b1d1a48d2
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
...
Former-commit-id: 3ad797690b
[formerly 214b2ed4ba
] [formerly 3ad797690b
[formerly 214b2ed4ba
] [formerly 1bf37125c4
[formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 946323416c
[formerly 711fbe98d2
]
Former-commit-id: a6a81a17d6
2013-03-28 17:02:14 -05:00
Richard Peter
c22b37600a
Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
...
Former-commit-id: 1228c8cbbc
[formerly b4fea10724
] [formerly 1228c8cbbc
[formerly b4fea10724
] [formerly 209d53ee67
[formerly 461708424eea856dacbd2bd2af506f8f905f19c7]]]
Former-commit-id: 209d53ee67
Former-commit-id: affe383cf3
[formerly 8b0347001d
]
Former-commit-id: a087e63bcb
2013-03-28 16:59:18 -05:00
Steve Harris
ef1e593ebd
Issue #1782 - restore FFPMGenerator.java
...
Former-commit-id: f01b5fb849
[formerly e67dbb206e
] [formerly f01b5fb849
[formerly e67dbb206e
] [formerly 3953f8368b
[formerly 813033f4a2b30a669646b288eb00959922f0e804]]]
Former-commit-id: 3953f8368b
Former-commit-id: bec6e9099f
[formerly a74d22efc5
]
Former-commit-id: 92aa705ebc
2013-03-28 16:06:54 -05:00
Bryan Kowal
8cd870d757
Issue #1750 - qpid updates for compatibility with operational servers
...
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes
Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f
Former-commit-id: d124f7a37f
[formerly 2819e8fe48
] [formerly d124f7a37f
[formerly 2819e8fe48
] [formerly e3c39b9be6
[formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]]
Former-commit-id: e3c39b9be6
Former-commit-id: fa5825b0c5
[formerly 07a52630a7
]
Former-commit-id: df6d81dfd9
2013-03-28 16:00:27 -05:00
Ben Steffensmeier
788df8fc68
Issue #1799 fix activation of tools for new perspectives.
...
Former-commit-id: dcbed65681
[formerly 50a276a7e2
] [formerly dcbed65681
[formerly 50a276a7e2
] [formerly 4efa92ff49
[formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]
Former-commit-id: 4efa92ff49
Former-commit-id: 33de9bfc87
[formerly a415fb17ae
]
Former-commit-id: a5e1593213
2013-03-28 15:47:36 -05:00
Max Schenkelberg
b30b72252b
Issue #1638 Added persistIndex route that only persists and indexes
...
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae
Former-commit-id: d55e7a0eda
[formerly e91406ab10
] [formerly d55e7a0eda
[formerly e91406ab10
] [formerly a308b27c2f
[formerly 3d386df8a1def460f81468154964603e7c1edbe8]]]
Former-commit-id: a308b27c2f
Former-commit-id: 623c49c3cc
[formerly d9a481f542
]
Former-commit-id: 58a5bebb80
2013-03-28 15:45:31 -05:00
Ron Anderson
bef17d4f03
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 27e07ce4a9
[formerly 5bb47b7931
] [formerly 27e07ce4a9
[formerly 5bb47b7931
] [formerly b65ecfc151
[formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 33bcf5fee8
[formerly 3f2fa771d9
]
Former-commit-id: 5eb1885dbd
2013-03-28 13:37:29 -05:00
Steve Harris
938243eb0b
Revert "Replaced with formatted version"
...
This reverts commit 20c9d653c8
[formerly 054d8d263f
] [formerly e074710e0a
[formerly cf9b267283
]] [formerly 18019c07a4
] [formerly ff977fc882
[formerly b741680965
] [formerly ff977fc882
[formerly b741680965
] [formerly 18019c07a4
[formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]].
Former-commit-id: c51c9ea5df
[formerly 29c5918428
] [formerly c51c9ea5df
[formerly 29c5918428
] [formerly 8400028e11
[formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]
Former-commit-id: 8400028e11
Former-commit-id: 7bd478fc41
[formerly b614bf53f6
]
Former-commit-id: 0074c522bb
2013-03-28 13:08:16 -05:00
Dustin Johnson
be22a59736
Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
...
Former-commit-id: 9bc6dd47b6
[formerly c618169639
] [formerly 9bc6dd47b6
[formerly c618169639
] [formerly 3991df64ff
[formerly 88779a4fbd8078d81139b7555525142940999558]]]
Former-commit-id: 3991df64ff
Former-commit-id: 3896cf42f1
[formerly d900459ab4
]
Former-commit-id: 9c4030ea37
2013-03-28 13:07:20 -05:00
Greg Armendariz
20c9d653c8
Replaced with formatted version
...
Former-commit-id: ff977fc882
[formerly b741680965
] [formerly ff977fc882
[formerly b741680965
] [formerly 18019c07a4
[formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]
Former-commit-id: 18019c07a4
Former-commit-id: e074710e0a
[formerly cf9b267283
]
Former-commit-id: 054d8d263f
2013-03-28 12:59:43 -05:00
Dustin Johnson
520b9f2a69
Merge "Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager" into development
...
Former-commit-id: 59393b633a
[formerly 8583a5f785
] [formerly 59393b633a
[formerly 8583a5f785
] [formerly 51bf00bf1c
[formerly bf39f3c73e4de589855abda284c6d2d46543d283]]]
Former-commit-id: 51bf00bf1c
Former-commit-id: ee26b669e3
[formerly db5a8b9865
]
Former-commit-id: 1cf371cd41
2013-03-28 12:25:12 -05:00
Dustin Johnson
a5009cb271
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: c2edf1dd89
[formerly ab42673848
] [formerly c2edf1dd89
[formerly ab42673848
] [formerly a4e4df02b0
[formerly 59977a0a652352a9128caaaf7d8f041b82941490]]]
Former-commit-id: a4e4df02b0
Former-commit-id: 85d6a19a5e
[formerly 902986256d
]
Former-commit-id: f135c0d948
2013-03-28 12:14:47 -05:00
Dustin Johnson
3850e46c2c
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e
Former-commit-id: 5e0073f1f9
[formerly 680d2984e1
] [formerly 5e0073f1f9
[formerly 680d2984e1
] [formerly 695c83669e
[formerly f6b91884ba72412a8fad2608eca1490757df2c60]]]
Former-commit-id: 695c83669e
Former-commit-id: d0056996cd
[formerly 25b6eb0eb9
]
Former-commit-id: fddc41bb6e
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
cca60522c4
Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager
...
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce
Former-commit-id: ec880b7923
[formerly ed9cb5f8f6
] [formerly ec880b7923
[formerly ed9cb5f8f6
] [formerly 6640a65a51
[formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]]
Former-commit-id: 6640a65a51
Former-commit-id: af5827f1de
[formerly c4496475a6
]
Former-commit-id: 5ec3ffed77
2013-03-28 12:08:57 -05:00
Greg Armendariz
817f9ec79c
Merge "Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep" into omaha_13.3.1
...
Former-commit-id: b543b515d9
[formerly a48365165b
] [formerly b543b515d9
[formerly a48365165b
] [formerly 943426fd00
[formerly 6eee456e38bcc5d4a7097868a50e6928cc99bf16]]]
Former-commit-id: 943426fd00
Former-commit-id: 10823802da
[formerly 05d1d16500
]
Former-commit-id: cccd9a73ca
2013-03-28 12:05:07 -05:00
Dustin Johnson
9d04ba83a5
Issue #1839 Change build.edex build.xml to support building work assignment features after main build
...
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9
Former-commit-id: ce37e32e61
[formerly 3be6669f1b
] [formerly ce37e32e61
[formerly 3be6669f1b
] [formerly 1365d5c9af
[formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]]
Former-commit-id: 1365d5c9af
Former-commit-id: 1960bcbf11
[formerly 83f6fb720c
]
Former-commit-id: f817dbe495
2013-03-28 11:43:24 -05:00
Bryan Kowal
cb965ceb79
Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep
...
- add Eclipse CDT configuration for 32-bit and 64-bit Linux compiles
Former-commit-id: 5fe808757f
[formerly c592e8a877
] [formerly 5fe808757f
[formerly c592e8a877
] [formerly 955b5c84d3
[formerly 6f51d7079a786534edfa4f60d365284611fb8c3e]]]
Former-commit-id: 955b5c84d3
Former-commit-id: 1a11fef532
[formerly 7a6f32796b
]
Former-commit-id: 087e7b2468
2013-03-28 10:42:51 -05:00
Max Schenkelberg
4253d92576
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 25202d8534
[formerly 573b441662
] [formerly 25202d8534
[formerly 573b441662
] [formerly 2b58e3ce3f
[formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: abcf4bf569
[formerly c9301b75ea
]
Former-commit-id: 223f946b90
2013-03-28 10:20:54 -05:00
Ben Steffensmeier
67b3b92712
Issue #1821 recalculate 6 hours to be longer.
...
Former-commit-id: 61e0ca3b75
[formerly a9cec71222
] [formerly 61e0ca3b75
[formerly a9cec71222
] [formerly efbdd3aa8c
[formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]]
Former-commit-id: efbdd3aa8c
Former-commit-id: e1a619e030
[formerly 403da9bfb9
]
Former-commit-id: 94dcd159d4
2013-03-28 10:16:11 -05:00
Lee Venable
03fd0004ec
Merge "Issue #1790 Bug fixes for SCAN." into development
...
Former-commit-id: a891171c43
[formerly e7805ded92
] [formerly a891171c43
[formerly e7805ded92
] [formerly 167fa6eadf
[formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]]
Former-commit-id: 167fa6eadf
Former-commit-id: 655f06cb65
[formerly 772bbe23a7
]
Former-commit-id: adbaebd457
2013-03-28 10:04:34 -05:00
Bryan Kowal
c29e1e5374
Issue #1821 - re-compile grib2.so 32-bit and 64-bit
...
Former-commit-id: 203a3d5200
[formerly da99727625
] [formerly 203a3d5200
[formerly da99727625
] [formerly 2da2b370db
[formerly f7f382d880134acb2f84bef990302aa91784c2d2]]]
Former-commit-id: 2da2b370db
Former-commit-id: 131e260337
[formerly 998fbe8769
]
Former-commit-id: 9343dee116
2013-03-28 09:48:27 -05:00
Roger Ferrel
18b74a6aa7
Issue #1790 Bug fixes for SCAN.
...
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 009cd032cb
[formerly 9c560ab626
] [formerly 009cd032cb
[formerly 9c560ab626
] [formerly e204276c17
[formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]]
Former-commit-id: e204276c17
Former-commit-id: 380846374f
[formerly 216fa1b23b
]
Former-commit-id: 3bb55722f5
2013-03-28 09:16:24 -05:00